From b33b32fc2808a0be9480d83d45630ebf61c27efe Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 7 Apr 2023 00:16:36 -0700 Subject: [PATCH 001/206] chromium: late-bind xdg-utils if broken xdg-utils does not cross-compile. Let's late-bind (using the runtime $PATH) in this scenario so a native-built xdg-utils can be used instead. --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++++- pkgs/applications/networking/browsers/chromium/default.nix | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e6dcf83e3f3e..d2e4ba8348fd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -136,7 +136,10 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libcap - xdg-utils minizip libwebp + ] ++ lib.optionals (!xdg-utils.meta.broken) [ + xdg-utils + ] ++ [ + minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -214,6 +217,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' + '' + lib.optionalString (!xdg-utils.meta.broken) '' sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 47b768cfb307..f26ac53ee70f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -212,8 +212,10 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + '' + lib.optionalString (!xdg-utils.meta.broken) '' # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" + '' + '' . w From 6143b4172be76426a7ec05f111fcb876da7054bd Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:05:41 +0900 Subject: [PATCH 002/206] python311Packages.questionary: unstable-2022-07-27 -> 2.0.1 Diff: https://github.com/tmbo/questionary/compare/848b040c5b7086ffe75bd92c656e15e94d905146...2.0.1 Changelog: https://github.com/tmbo/questionary/blob/2.0.1/docs/pages/changelog.rst --- pkgs/development/python-modules/questionary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index c355022323fb..40c3beb6bb4c 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "questionary"; - version = "unstable-2022-07-27"; + version = "2.0.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tmbo"; repo = pname; - rev = "848b040c5b7086ffe75bd92c656e15e94d905146"; - hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY="; + rev = "refs/tags/${version}"; + hash = "sha256-JY0kXomgiGtOrsXfRf0756dTPVgud91teh+jW+kFNdk="; }; nativeBuildInputs = [ From 44c59cb218cbf955fe194c4cdb1f994e8ebce2d6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 14:25:38 +0900 Subject: [PATCH 003/206] python311Packages.questionary: add changelog to meta --- pkgs/development/python-modules/questionary/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 40c3beb6bb4c..6f9b0488c5d2 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to build command line user prompts"; homepage = "https://github.com/tmbo/questionary"; + changelog = "https://github.com/tmbo/questionary/blob/${src.rev}/docs/pages/changelog.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 7c846eb3ca367dbd1995c0b71f106d2861367038 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:10:41 +0900 Subject: [PATCH 004/206] python311Packages.pilkit: unstable-2022-02-17 -> 3.0 Diff: https://github.com/matthewwithanm/pilkit/compare/09ffa2ad33318ae5fd3464655c14c7f01ffc2097...3.0 --- pkgs/development/python-modules/pilkit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 1b17e2411536..2ca211f75c9c 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pilkit"; - version = "unstable-2022-02-17"; + version = "3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwithanm"; repo = pname; - rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; - hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; + rev = "refs/tags/${version}"; + hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; - buildInputs = [ + propagatedBuildInputs = [ pillow ]; From 8113dbcf2e2544236cba28d359cb32b809dd0a59 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 15:56:04 +0900 Subject: [PATCH 005/206] python311Packages.pilkit: change the license to BSD3 and adopt `pyproject = true` --- pkgs/development/python-modules/pilkit/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 2ca211f75c9c..76f6238349a5 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -5,12 +5,13 @@ , pillow , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pilkit"; version = "3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pillow ]; @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A collection of utilities and processors for the Python Imaging Library"; homepage = "https://github.com/matthewwithanm/pilkit/"; - license = licenses.bsd0; + license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; } From 7b4e8f91da954ab741df634f440f57699bd84a57 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 21 Oct 2023 12:55:27 -0400 Subject: [PATCH 006/206] dante: fix build with clang 16 Fix two configure checks that fail on clang 16 due to unexpected errors: * Undefined type `uint8_t` by including `stdint.h`; and * Unused `sa_len_ptr` by incrementing the target of the pointer. --- pkgs/servers/dante/clang-osint-m4.patch | 34 +++++++++++++++++++++++++ pkgs/servers/dante/default.nix | 9 +++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/dante/clang-osint-m4.patch diff --git a/pkgs/servers/dante/clang-osint-m4.patch b/pkgs/servers/dante/clang-osint-m4.patch new file mode 100644 index 000000000000..65281e22ea0e --- /dev/null +++ b/pkgs/servers/dante/clang-osint-m4.patch @@ -0,0 +1,34 @@ +diff -ur a/osdep.m4 b/osdep.m4 +--- a/osdep.m4 2017-01-18 09:11:20.000000000 -0500 ++++ b/osdep.m4 2023-10-21 12:43:59.464797030 -0400 +@@ -381,6 +381,7 @@ + unset have_sa_len + AC_MSG_CHECKING([for sa_len in sockaddr]) + AC_TRY_COMPILE([ ++#include + #include + #include + ], [struct sockaddr sa; +@@ -397,12 +398,13 @@ + unset sa_len_type_found + for type in uint8_t "unsigned char"; do + AC_TRY_COMPILE([ ++#include + #include + #include ], [ + struct sockaddr sa; + $type *sa_len_ptr; + sa_len_ptr = &sa.sa_len; +-sa_len_ptr++; /* use to avoid warning/error */], ++(*sa_len_ptr)++; /* use to avoid warning/error */], + [AC_DEFINE_UNQUOTED(sa_len_type, [$type], [sa_len type]) + sa_len_type_found=t + break]) +@@ -636,6 +638,7 @@ + in_port_t, in_addr_t], + , , + [ ++#include + #include + #include + ]) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 49e6a26f455f..a5806a20d411 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -22,12 +22,17 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; - patches = lib.optionals remove_getaddrinfo_checks [ + patches = [ + # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer + # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`. + ./clang-osint-m4.patch + ] ++ lib.optionals remove_getaddrinfo_checks [ (fetchpatch { name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y="; - }) ]; + }) + ]; postPatch = '' substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' "" From 72e5e4ea54e73326fdf788181c0dccafe164b3cf Mon Sep 17 00:00:00 2001 From: Aleksey Mikhaylov Date: Sun, 22 Oct 2023 16:26:38 +0300 Subject: [PATCH 007/206] kakounePlugins: updated the 10-22-2023 --- .../editors/kakoune/plugins/aliases.nix | 1 + .../editors/kakoune/plugins/generated.nix | 30 +++++++++++++------ .../kakoune/plugins/kakoune-plugin-names | 1 + .../editors/kakoune/plugins/update.py | 3 ++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index 2f097dee5275..1d516f9b436f 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -39,6 +39,7 @@ in mapAliases ({ kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04 kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04 + kak-byline = byline-kak; # backwards compat, added 2023-10-22 kak-fzf = fzf-kak; # backwards compat, added 2021-01-04 kak-powerline = powerline-kak; # backwards compat, added 2021-01-04 kak-prelude = prelude-kak; # backwards compat, added 2021-01-04 diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index a37c90fb99d3..84fc2cec0a95 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -17,16 +17,28 @@ packages = ( self: auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2022-03-13"; + version = "2023-07-30"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; - sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; + rev = "d4b33b783ea42a536c848296b5b6d434b4d1470f"; + sha256 = "017x9g89q0w60y561xhigc0f14ryp4phh1hdna847ca5lvmbxksp"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; + byline-kak = buildKakounePluginFrom2Nix { + pname = "byline-kak"; + version = "2023-02-27"; + src = fetchFromGitHub { + owner = "evanrelf"; + repo = "byline.kak"; + rev = "a27d109b776c60e11752eeb3207c989a5e157fc0"; + sha256 = "121dxd65ml65ablkvdxj0rib3kvfwss0pv943bgl3nq35ag19b81"; + }; + meta.homepage = "https://github.com/evanrelf/byline.kak/"; + }; + connect-kak = buildKakounePluginFrom2Nix { pname = "connect-kak"; version = "2021-02-24"; @@ -137,12 +149,12 @@ packages = ( self: kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2022-11-29"; + version = "2023-04-20"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; - sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; + rev = "dbb39712e3824ca6142b510f26f35a769934a1e1"; + sha256 = "1wncx16a8mi2b81cvkiji3ccv8is5g3sa4hwf1669va5a432vdwn"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -209,12 +221,12 @@ packages = ( self: tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-07-05"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; - sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; + rev = "f0b3a399db1dfa12b89fbff3eed09aec74725bab"; + sha256 = "1sg26bv4vr08pqyxp68wsmzj8vhi2qg1bmkqb2jnngi5sjp4r7xy"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index b856308c7831..3f4a640e2f35 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,6 +1,7 @@ repo,branch,alias https://github.com/greenfork/active-window.kak/,, https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/evanrelf/byline.kak/,, https://github.com/kakounedotcom/connect.kak/,, https://github.com/andreyorst/fzf.kak/,, https://github.com/lePerdu/kakboard/,, diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 5ce54c834f08..5e0ca51727c1 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -73,6 +73,9 @@ in lib.fix' (lib.extends overrides packages) ) print(f"updated {outfile}") + def update(self, args): + pluginupdate.update_plugins(self, args) + def main(): editor = KakouneEditor("kakoune", ROOT, GET_PLUGINS) From 673605c4e4223b68709dc8603675c0e651c93c3a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 30 Apr 2023 23:25:46 -0700 Subject: [PATCH 008/206] linux: allow to omit the common-config.nix --- pkgs/os-specific/linux/kernel/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a21890a38ca2..74c47db62561 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -25,6 +25,10 @@ # Additional make flags passed to kbuild , extraMakeFlags ? [] +, # enables the options in ./common-config.nix; if `false` then only + # `structuredExtraConfig` is used + enableCommonConfig ? true + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -183,7 +187,9 @@ let moduleStructuredConfig = (lib.evalModules { modules = [ module + ] ++ lib.optionals enableCommonConfig [ { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; } + ] ++ [ { settings = structuredExtraConfig; _file = "structuredExtraConfig"; } ] ++ structuredConfigFromPatches From 4b89da79806d46f1533871436fcfec991eb4561c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 00:17:20 +0000 Subject: [PATCH 009/206] qgroundcontrol: 4.2.8 -> 4.2.9 --- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 9f88fe58e3c4..0ff923375669 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.8"; + version = "4.2.9"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EmGtVy/cHiZ2SqOOKmt9vCUQbyT5Sl8XnkRlhn9BdvA="; + sha256 = "sha256-nzBap5ldlLLLBB1ILkOktt9FnBqbo8MALLOETiqoAzk="; fetchSubmodules = true; }; From ed5caab7e015f919ceddd5ddfdc0366ebea29caf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 06:29:09 +0000 Subject: [PATCH 010/206] vitess: 17.0.2 -> 17.0.3 --- pkgs/development/tools/database/vitess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index da9740740615..ad7837800600 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vitess"; - version = "17.0.2"; + version = "17.0.3"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-uST+FtYhGIn/Tieyofbh2r8xonw8qsS6ODrpd/A27r4="; + hash = "sha256-/nj//8mCP6ytsdJAj/rJ0/vDEyyvOyUWNaLELBe/yts="; }; vendorHash = "sha256-0OrPbMG7ElOD+9/kWx1HtvGUBiFpIsNs5Vu7QofzE6Q="; From 3a81a607ab03d955e390ebc53f7496a526d34c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 06:57:08 +0000 Subject: [PATCH 011/206] vmagent: 1.93.5 -> 1.93.6 --- pkgs/servers/monitoring/vmagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index b62f9f7e8cf1..7ccd36981a46 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.93.5"; + version = "1.93.6"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs="; + sha256 = "sha256-5z8o6I2AoX43t4UeOjxha9fkEDxVDRhdGNgVZGlHrRE="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; From 03c40199a6a1fe084aa66b09785cba80686e52d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 10:53:18 +0000 Subject: [PATCH 012/206] vokoscreen-ng: 3.7.0 -> 3.8.0 --- pkgs/applications/video/vokoscreen-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index e601f0443c43..6f445da73d38 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-epz/KoXo84zzCD1dzclRWgeQSqrgwEtaIGvrTPuN9hw="; + sha256 = "sha256-4tQ/fLaAbjfc3mt2qJsW9scku/CGUs74SehDaZgLPj4="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; From 3a5035e3bef47c95413b9cf543b46c06c9ac54e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 11:19:26 +0000 Subject: [PATCH 013/206] vttest: 20230201 -> 20230924 --- pkgs/tools/misc/vttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 96915f5c9fdf..6b649cbb71d2 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20230201"; + version = "20230924"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-J/QwB5Hny8+dFfiEIfmONdOu5mMRNoQwYk4sGlqL5oM="; + sha256 = "sha256-vosHy1kJdtH0KvhZfdrayAjQiwomi7YwSoh9qz8Toig="; }; meta = with lib; { From 220e1c3f3fd7fbbb9987de283b6fe33e6ae937f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 14:32:21 +0000 Subject: [PATCH 014/206] vulkan-utility-libraries: 1.3.261 -> 1.3.269 --- .../libraries/vulkan-utility-libraries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 54e7afb3e58c..f82fad836273 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.261"; + version = "1.3.269"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + hash = "sha256-7BN+U97dqpSyCYhHuFTPqokRnABH7Gt91njZPxItpzg="; }; nativeBuildInputs = [ cmake python3 ]; From 21005263f5123f5312cecfb64c37e3fe24c621e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 15:43:59 +0000 Subject: [PATCH 015/206] wallabag: 2.6.6 -> 2.6.7 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 251735e0f78e..87bde25166c3 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.6.6"; + version = "2.6.7"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Release tarball includes vendored files src = fetchurl { url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; - hash = "sha256-0CkJFSHPnOz333+7uMUqXI3A9dsA9FchZXXmwq7F09o="; + hash = "sha256-prk/sF72v5qyBv1Lz/2nY6LPM+on5/gwAMM1u9+X8xA="; }; patches = [ From fd9696710dc37fc076b36b186e45cdec1c9cdbd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 16:48:27 +0000 Subject: [PATCH 016/206] weaviate: 1.21.1 -> 1.21.7 --- pkgs/servers/search/weaviate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index d195d6511a42..f63805cd36e4 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.21.1"; + version = "1.21.7"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-rWoVuWzfRJhhYDwOBcmSIJXh0WwvZFYM2GPOMvP98xM="; + hash = "sha256-fhBjKmWtbivntgBFmxfG4bQNUvCdP5uWtysOvsSqFuw="; }; - vendorHash = "sha256-HUfkwmAIwTPDZsgRLte7tu/0QKT82WriTqJ14iiKKOs="; + vendorHash = "sha256-/ylYXwgJKtkAIvYgSsl8MzBxuxp0Nco3ZR4ZBdmmS+w="; subPackages = [ "cmd/weaviate-server" ]; From 5633e62305842db0a5317e54760785609d31cc5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 17:56:01 +0000 Subject: [PATCH 017/206] wfa2-lib: 2.3.3 -> 2.3.4 --- pkgs/development/libraries/wfa2-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix index 1f97f9c95a6c..1543484868bf 100644 --- a/pkgs/development/libraries/wfa2-lib/default.nix +++ b/pkgs/development/libraries/wfa2-lib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wfa2-lib"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; rev = "v${version}"; - hash = "sha256-PLZhxKMBhKm6E/ENFZ/yWMWIwJG5voaJls2in44OGoQ="; + hash = "sha256-h4e+f+JkQr3qqaBUDly24ZvKxaEGzeJtMXejh8aD5D0="; }; nativeBuildInputs = [ From c485709e2a64d24feb3999a198d52b3556077826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 20:39:53 +0000 Subject: [PATCH 018/206] wipefreespace: 2.5 -> 2.6 --- pkgs/tools/filesystems/wipefreespace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix index 03adc070c0ef..f9d586d91d68 100644 --- a/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "wipefreespace"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://sourceforge/project/wipefreespace/wipefreespace/${version}/wipefreespace-${version}.tar.gz"; - hash = "sha256-wymV6G4Et5TCoIztZfdb3xuzjdBHFyB5OmI4EcsJKwQ="; + hash = "sha256-Pt6MDQ9wSJbL4tW/qckTpFsvE9FdXIkp/QmnYSlWR/M="; }; nativeBuildInputs = [ From 5e1dad5e6c56ebb5be1b2a920aaf1eb2c51138f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 21:54:34 +0000 Subject: [PATCH 019/206] wxsqlite3: 4.9.4 -> 4.9.6 --- pkgs/development/libraries/wxsqlite3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 5dc9829b1a3a..f058ac7ed0e3 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.4"; + version = "4.9.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U="; + hash = "sha256-ah9EFj15cP9soVJATVJk4XGYItxcrt4HB6ZTfpsVhS8="; }; nativeBuildInputs = [ autoreconfHook ]; From dd4c55900665400ab0fc71df23a0735b8ee37a59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 00:55:12 +0000 Subject: [PATCH 020/206] xastir: 2.1.8 -> 2.2.0 --- pkgs/applications/misc/xastir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index abb5d0b96096..21990075183d 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.8"; + version = "2.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - hash = "sha256-hRe0KO1lWOv3hNNDMS70t+X1rxuhNlNKykmo4LEU+U0="; + hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw="; }; nativeBuildInputs = [ From 10da5e8a47bce52d8f3b6602e126bf7ab851d047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 03:44:56 +0000 Subject: [PATCH 021/206] xlockmore: 5.72 -> 5.73 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 3b771ffedc26..a2bf191dd36a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.72"; + version = "5.73"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-1RGXWWeuc1UHKs3M9rG/QU+KFr5QzMgHDxPmJGI+x3I="; + sha256 = "sha256-MOH85e5L/r99fXRq9Gf5awvIUh/NC1C4Vh/VtW3rh10="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; From 78583ba088869664fca68de5fdb119b7670f1f97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 03:52:04 +0000 Subject: [PATCH 022/206] xmlbird: 1.2.12 -> 1.2.14 --- pkgs/tools/misc/birdfont/xmlbird.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index cacebb939953..10aec3834351 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xmlbird"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz"; - sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04"; + sha256 = "sha256-qygvJC1glSfvwWL7oQPFykgitvnWXwHMhycSjSBGksU="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection ]; From 9c446d3911e7c4b6633b9428577345b95964f430 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 05:07:01 +0000 Subject: [PATCH 023/206] yoshimi: 2.3.0.3 -> 2.3.1 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 459cbd6388b4..abe49c44f6fa 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.0.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-IsmhLUGqoa4Le86LE9SHFiXeiIKgwNfLaPFYXxnC9BM="; + hash = "sha256-NMgy/ucuSRFX2zlO8GhL4QSP4NZo1QKZJYTc2eXzWUA="; }; sourceRoot = "${src.name}/src"; From 6ff4f2c2569f0a3280081b7d6da421a8baa23b51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 05:25:06 +0000 Subject: [PATCH 024/206] yubihsm-shell: 2.4.0 -> 2.4.1 --- pkgs/tools/security/yubihsm-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 650224dd03b1..37ac2ec1ae4e 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yubihsm-shell"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = version; - hash = "sha256-zWhvECPdZnrbSAVPDVZk54SWHVkd/HEQxS3FgXoqXHY="; + hash = "sha256-Ucqi+ZAoTkmj/UfdoisNxzDIyjW8j9gf/NR0WZCO4wo="; }; postPatch = '' From 60a0ada1f844a8ffefa81b7de9ba34214c710a4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 06:57:07 +0000 Subject: [PATCH 025/206] zef: 0.19.1 -> 0.20.0 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 4b0d0388466c..fc7e541ceff6 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-tA3BH8YlOHCcbYht2mnZr05vtUfeHn6LGB5Hrylbrpw="; + sha256 = "sha256-IWOgbKYaWKjC2+dc2P3THAVy23F3iQXh2D6od/0e0Jw="; }; nativeBuildInputs = [ makeWrapper ]; From 4680452994068fb0f9b699d515a02e0253e0019f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 09:10:24 +0000 Subject: [PATCH 026/206] zrok: 0.4.6 -> 0.4.10 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 49a495493d88..7420942a1c76 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-w3BF5Zu68e7X6vfkJhUTS6wkg7LSFZunx9dnBA2Ao5c="; - aarch64-linux = "sha256-hJiXDydUF750mTsFIXH6X8AjzjaG2Iaa+TzsCCCVAvs="; - armv7l-linux = "sha256-lEPo6Y+cqlG2QflwJdG/MNqFLMPdwQLI0+TC/VVlGV4="; + x86_64-linux = "sha256-c/MLhCmfoC5qbIH8psHqVexjKGb6P9vxMag7igFKt84="; + aarch64-linux = "sha256-CaZr0Izhwkdb6Hf3wRdOskoDg3m9LNgCPgfxka+ZwWo="; + armv7l-linux = "sha256-YVqm2tfcti5a6adN9Rn8X41nTTT5bajSJ0qIEvgk/8s="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.6"; + version = "0.4.10"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; From 1f4552da2261def9665210e9ca2c769b32f4571b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 09:28:02 +0000 Subject: [PATCH 027/206] albert: 0.22.13 -> 0.22.14 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index ceb74f7b0a32..d76231ee8c16 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.13"; + version = "0.22.14"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-IZpIgU/cf25XxH8J0xQJLASu0YmTmcHY5RxUcbKrtvA="; + sha256 = "sha256-cAxdCjaCqEkwjL+OXW7ONkS7OpKfey3bUYmGzJyV+g8="; fetchSubmodules = true; }; From beb33584013f49d198152ad8ae8797bb6fa0266f Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 24 Oct 2023 10:06:11 +0000 Subject: [PATCH 028/206] gsound: enable introspection/vala when cross compiled --- pkgs/development/libraries/gsound/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 7dbe5cd2bbfc..6c5c98b77d7f 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -14,11 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - "-Denable_vala=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; From 07bd6950264963127bbe6962868fcb30cad01abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 10:12:41 +0000 Subject: [PATCH 029/206] aespipe: 2.4f -> 2.4g --- pkgs/tools/security/aespipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index ad4cf36fa32d..9ab8e089f30b 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aespipe"; - version = "2.4f"; + version = "2.4g"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "15pg9j27mjzl78mpzkdqd84kdafj0g6j72f8wgjrpp2qkxjy2ddi"; + sha256 = "sha256-v7l+feFh6NfOETsWO9odGo7HfSwa+rVtzIFT16kBh/w="; }; nativeBuildInputs = [ makeWrapper ]; From ce6f5b781e3a06ce6042187cac7c8e36acf11e7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 10:45:50 +0000 Subject: [PATCH 030/206] fim: 0.6 -> 0.7 --- pkgs/tools/graphics/fim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 6722e1d78192..0f2e11ba59b8 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -11,11 +11,11 @@ gcc9Stdenv.mkDerivation rec { pname = "fim"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz"; - sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp"; + sha256 = "sha256-/p7bjeZM46DJOQ9sgtebhkNpBPj2RJYY3dMXhzHnNmg="; }; postPatch = '' From 169f2703864c27cb6403d7d554d34c8f93376f9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 11:46:45 +0000 Subject: [PATCH 031/206] go-camo: 2.4.4 -> 2.4.5 --- pkgs/by-name/go/go-camo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index a7761f341c0b..69dccb00318c 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-27kAVuFJaGKt7q9E2tchAD6kSukO4xkhU+1JTPfT3Qk="; + sha256 = "sha256-qELWl8kWQzgwQ8Mwp7MAxlYhHV6Us3kTuMjKVwJjZFs="; }; - vendorHash = "sha256-LVQnQ8Tpkzpc6aUsUgwz2xTttccHynJPsQKvWGiRAIU="; + vendorHash = "sha256-PF7WqA3hdV+eFu++eoCo1m2m4o92vUtArH0uS+rjxGU="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; From 5d0c92ba3d257e9c927ba9049cc2ca40b777c759 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Oct 2023 15:56:28 +0000 Subject: [PATCH 032/206] crowdsec: 1.5.4 -> 1.5.5 --- pkgs/tools/security/crowdsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index 9c3dceda96f6..ed97dd98c03d 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-5VwsuPNoAhCvhKUJDUkXnEVLMqHx2M1Nz11VoBASoxU="; + hash = "sha256-dE2PeYyC75y9dc84QdhQ6xaLMPdPWtPDse2sY5bFGwU="; }; - vendorHash = "sha256-6ODcb7UQPgM5n5RPN4AdkrY3+vlu+GXlUfrlTePywyY="; + vendorHash = "sha256-hvandF9LPh1g4zIgmNIyId2YhqHU4RPKHGCtJI9aoPk="; nativeBuildInputs = [ installShellFiles ]; From 3cc6ad19d7bbb5e57dd8eb5a10a5441278705029 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 01:32:56 +0000 Subject: [PATCH 033/206] benthos: 4.19.0 -> 4.22.0 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 8dc8b26f43dd..071bc11c50f8 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.19.0"; + version = "4.22.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-C/dExBN+ZBE8o3L0RBgYe4griFhv/Yd2I10em2UK/nQ="; + hash = "sha256-RlwHaLW27Y6yRzlvFLpJhOkPa1dYoX87XxMKecoT/dE="; }; - vendorHash = "sha256-33eY+jF12lYSO1Fqm1hRLKA1+aMNxe0c9gqNl2wf10I="; + vendorHash = "sha256-9h7AocnhfYecEQbvesuFwXm+cTSd5lS9kdWjjO0GZP4="; doCheck = false; From 951430c3abb5ed4ebb72184634423dbbee11b407 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 04:55:35 +0000 Subject: [PATCH 034/206] codeql: 2.14.6 -> 2.15.1 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 1a01d162406c..c23c933e48e0 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.6"; + version = "2.15.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-MmVH5rB6yg5w8RsrRkiV7bfCxHgp0jw27IOmUS3fcHA="; + hash = "sha256-ksWf5z0PM5osMxnR5XeEyZw4g7UbHUCqnpw2FB5M6kU="; }; nativeBuildInputs = [ From 0a431bfe3b3ce2e1d5ce68ce981ea3f03463b863 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 05:45:10 +0000 Subject: [PATCH 035/206] coreth: 0.12.5 -> 0.12.6 --- pkgs/applications/networking/coreth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 681be48cb9bb..92319f173493 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-jHJubqNmU0OkKmWNCkucmv+IM19x3nfyDkfBpRihh7Y="; + hash = "sha256-AmlDOtV6uQtrscvIgK5kz6PldA7a1XrVuwO4DCFZeno="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-GKAGBEHP09NJ/GLq349K9VwFGt8rCvoHu8BB8TzN4CU="; + vendorHash = "sha256-v1DoRZuv6k6UIgPirXMbvunttn1aBLbTc+GdtdKquDk="; ldflags = [ "-s" From 3d3f4c0cb8d5bf1b5919d42cadf721ef58abdaf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 13:02:10 +0000 Subject: [PATCH 036/206] coin-utils: 2.11.9 -> 2.11.10 --- .../development/libraries/science/math/coin-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 6cb7666e5688..22aa10fc6d1e 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { - version = "2.11.9"; + version = "2.11.10"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; rev = "releases/${version}"; - hash = "sha256-DgHVbcXd36WW6JQbiq1MUHAiKLs8CTau87rs0T76sGs="; + hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; doCheck = true; From e32757ad3aebd7a8cede506a1b7ead6e7bfb16fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 16:06:19 +0000 Subject: [PATCH 037/206] opkg: 0.6.1 -> 0.6.2 --- pkgs/tools/package-management/opkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index f62e6e246f69..ce7da010ea2c 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "opkg"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - hash = "sha256-6H/MtXXGTTrAVZREAWonlfEhJZhqDaiWurl8ShovGyo="; + hash = "sha256-rHOpCiVJzQSUjlY9kVkSx44bi6D0OvdcWlP8ykdK29U="; }; nativeBuildInputs = [ From 02349bcc6969c05276272d34aeb566586ce8bc6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 18:18:34 +0000 Subject: [PATCH 038/206] otpclient: 3.1.9 -> 3.2.0 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index b313ab2fa1a2..04794635cdfb 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.9"; + version = "3.2.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg="; + hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI="; }; nativeBuildInputs = [ From 31790f5d1926d8799f052ed3f00f45df4c02fe96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 12:13:38 +0000 Subject: [PATCH 039/206] level-zero: 1.14.0 -> 1.15.1 --- pkgs/development/libraries/level-zero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 0c953b8d8710..f2ea91bf8be8 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-7hFGY255dLgDo93+Nx2we/cfEtwaiaajdVg1VTst1/U="; + hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; From 764c1c2a46a7045fce332fb71f4e6a419758d692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 16:31:25 +0000 Subject: [PATCH 040/206] upx: 4.1.0 -> 4.2.0 --- pkgs/tools/compression/upx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 4c808acd003e..09aab8258a81 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "upx"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "upx"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-pHJypO+sK7+ytM7yJxJpfBJHTYpGc9nr/JiFGd7hlJM="; + sha256 = "sha256-PRfIJSjmeXjbslqWnKrHUPdOJfZU08nr4wXoAnP9qm0="; }; nativeBuildInputs = [ cmake ]; From 6e15779fda5c92bc77425abcf3532a86b5f813b1 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 25 Oct 2023 23:56:07 +0000 Subject: [PATCH 041/206] nixos/sudo: fix `security.sudo.package` --- nixos/modules/security/sudo.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index d225442773c6..c665c15242a5 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -6,8 +6,6 @@ let cfg = config.security.sudo; - inherit (pkgs) sudo; - toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; @@ -247,7 +245,7 @@ in }; }; - environment.systemPackages = [ sudo ]; + environment.systemPackages = [ cfg.package ]; security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; }; From ad2838c30fe0eab6564345257e098c9ea9692823 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 20:11:05 +0000 Subject: [PATCH 042/206] ergo: 5.0.14 -> 5.0.15 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 1945ae3eed67..7ff9b9563d90 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.14"; + version = "5.0.15"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-YcFjnDs1hAmkYmJlq3yvY/IP6P9SPVGknbzapl5C2B4="; + sha256 = "sha256-/VMuye6uCQghjwotjmWEe55RADVwHCpH6PelZXVXSzM="; }; nativeBuildInputs = [ makeWrapper ]; From c0d6bc38744ce416d9c8d249fd0da881b47aa3e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 01:50:56 +0000 Subject: [PATCH 043/206] bruno: 0.27.0 -> 0.27.2 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index b058449ea224..e8667bc468ab 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "0.27.0"; + version = "0.27.2"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-57Cbp/+3rNq/bhUItPuN6ZIjSd8IzmJsn9FNm89khiE="; + hash = "sha256-FhlwwdX845Say6I/g9HYRTexh94DXhc/K9jmqFiHwVY="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; From c57c3733cbc5ed7c045d881338226bbc82000378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 06:17:56 +0000 Subject: [PATCH 044/206] frugal: 3.17.2 -> 3.17.5 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 4ce0ab171898..e1836b92051c 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.2"; + version = "3.17.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7+8wjWxePU3OrIf9SLYzu6jAaaeB3MUzZ/H6tdFn3ts="; + sha256 = "sha256-NkzlhxlQISqFmYeO7LttwMWhvL7YblrWREkvnKrpTuA="; }; subPackages = [ "." ]; - vendorHash = "sha256-vES8WGaurEW5X9PX+ILN4XUGoSEtayq7UAes+1URKzg="; + vendorHash = "sha256-iZl5DWZYecXCirJumnidgEWrqfaz+fvM3udOWOC6Upk="; meta = with lib; { description = "Thrift improved"; From 444622b7424e8ddd1465cea93fdb143fc4c6ac25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 11:08:43 +0000 Subject: [PATCH 045/206] bacnet-stack: 1.0.0 -> 1.3.1 --- pkgs/tools/networking/bacnet-stack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index 9e47993df602..6a514939aacf 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bacnet-stack"; - version = "1.0.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; rev = "bacnet-stack-${version}"; - sha256 = "078p7qsy9v6fl7pzwgcr72pgjqxfxmfxyqajih2zqlb5g5sf88vh"; + sha256 = "sha256-Uq55zrcP8jBKklmT2AZfL8gkplm/wwSDAh/yXd1jydc="; }; hardeningDisable = [ "all" ]; From 132d985be99b0c572edc5840afb83f39afafe8f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 16:18:37 +0000 Subject: [PATCH 046/206] flat-remix-gnome: 20230606 -> 20231026 --- pkgs/data/themes/flat-remix-gnome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 7a8444afbe3c..61ddd00abd30 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20230606"; + version = "20231026"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-NnCRWADyAOR5yyOjB18zSQov+5FfKhhCSkDXBAL80wo="; + hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource From c15e1f61b005d2606b16efa8e36bdf3f96f6e09a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 16 Oct 2023 21:31:39 +1300 Subject: [PATCH 047/206] ssh-audit: add test of audited configuration On current nixpkgs, no modifications to the server settings were necessary to pass the audit. However, some of the client algorithms were considered insecure. The client configuration lists all algorithms which were listed as acceptable by `ssh-audit`. This can be used as an example of a configuration currently considered acceptable by `ssh-audit`, and verifies that such a configuration results in a compatible client/server configuration. Beware that this test will continue passing when future versions of `ssh-audit` add support for new algorithms. In other words, the example configuration represents a subset of what the current version of `ssh-audit` would consider acceptable. --- nixos/tests/all-tests.nix | 1 + nixos/tests/ssh-audit.nix | 103 ++++++++++++++++++++++ pkgs/tools/security/ssh-audit/default.nix | 5 ++ 3 files changed, 109 insertions(+) create mode 100644 nixos/tests/ssh-audit.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4a3f4a331ca8..21b11fe7d9f1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -750,6 +750,7 @@ in { spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; + ssh-audit = handleTest ./ssh-audit.nix {}; sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix {}; sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix {}; stalwart-mail = handleTest ./stalwart-mail.nix {}; diff --git a/nixos/tests/ssh-audit.nix b/nixos/tests/ssh-audit.nix new file mode 100644 index 000000000000..bd6255b8044d --- /dev/null +++ b/nixos/tests/ssh-audit.nix @@ -0,0 +1,103 @@ +import ./make-test-python.nix ( + {pkgs, ...}: let + sshKeys = import (pkgs.path + "/nixos/tests/ssh-keys.nix") pkgs; + sshUsername = "any-user"; + serverName = "server"; + clientName = "client"; + sshAuditPort = 2222; + in { + name = "ssh"; + + nodes = { + "${serverName}" = { + networking.firewall.allowedTCPPorts = [ + sshAuditPort + ]; + services.openssh.enable = true; + users.users."${sshUsername}" = { + isNormalUser = true; + openssh.authorizedKeys.keys = [ + sshKeys.snakeOilPublicKey + ]; + }; + }; + "${clientName}" = { + programs.ssh = { + ciphers = [ + "aes128-ctr" + "aes128-gcm@openssh.com" + "aes192-ctr" + "aes256-ctr" + "aes256-gcm@openssh.com" + "chacha20-poly1305@openssh.com" + ]; + extraConfig = '' + IdentitiesOnly yes + ''; + hostKeyAlgorithms = [ + "rsa-sha2-256" + "rsa-sha2-256-cert-v01@openssh.com" + "rsa-sha2-512" + "rsa-sha2-512-cert-v01@openssh.com" + "sk-ssh-ed25519-cert-v01@openssh.com" + "sk-ssh-ed25519@openssh.com" + "ssh-ed25519" + "ssh-ed25519-cert-v01@openssh.com" + ]; + kexAlgorithms = [ + "curve25519-sha256" + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + "diffie-hellman-group16-sha512" + "diffie-hellman-group18-sha512" + "sntrup761x25519-sha512@openssh.com" + ]; + macs = [ + "hmac-sha2-256-etm@openssh.com" + "hmac-sha2-512-etm@openssh.com" + "umac-128-etm@openssh.com" + ]; + }; + }; + }; + + testScript = '' + start_all() + + ${serverName}.wait_for_open_port(22) + + # Should pass SSH server audit + ${serverName}.succeed("${pkgs.ssh-audit}/bin/ssh-audit 127.0.0.1") + + # Wait for client to be able to connect to the server + ${clientName}.wait_for_unit("network-online.target") + + # Set up trusted private key + ${clientName}.succeed("cat ${sshKeys.snakeOilPrivateKey} > privkey.snakeoil") + ${clientName}.succeed("chmod 600 privkey.snakeoil") + + # Fail fast and disable interactivity + ssh_options = "-o BatchMode=yes -o ConnectTimeout=1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" + + # Should deny root user + ${clientName}.fail(f"ssh {ssh_options} root@${serverName} true") + + # Should deny non-root user password login + ${clientName}.fail(f"ssh {ssh_options} -o PasswordAuthentication=yes ${sshUsername}@${serverName} true") + + # Should allow non-root user certificate login + ${clientName}.succeed(f"ssh {ssh_options} -i privkey.snakeoil ${sshUsername}@${serverName} true") + + # Should pass SSH client audit + service_name = "ssh-audit.service" + ${serverName}.succeed(f"systemd-run --unit={service_name} ${pkgs.ssh-audit}/bin/ssh-audit --client-audit --port=${toString sshAuditPort}") + ${clientName}.sleep(5) # We can't use wait_for_open_port because ssh-audit exits as soon as anything talks to it + ${clientName}.execute( + f"ssh {ssh_options} -i privkey.snakeoil -p ${toString sshAuditPort} ${sshUsername}@${serverName} true", + check_return=False, + timeout=10 + ) + ${serverName}.succeed(f"exit $(systemctl show --property=ExecMainStatus --value {service_name})") + ''; + } +) diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index 2a4abc11ea7b..668f3c206f61 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, nixosTests , python3Packages }: @@ -19,6 +20,10 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; + passthru.tests = { + inherit (nixosTests) ssh-audit; + }; + meta = with lib; { description = "Tool for ssh server auditing"; homepage = "https://github.com/jtesta/ssh-audit"; From 436118d6d74e28e6fd477499f0e1d80a3854c38b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Oct 2023 23:51:51 +0000 Subject: [PATCH 048/206] iotop-c: 1.24 -> 1.25 --- pkgs/os-specific/linux/iotop-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 016651deb492..1d7dc9e4d112 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-oSKNP/WY0Ivhj5LgyeerzZbleMcUn8ho0aqsiunqvyU="; + sha256 = "sha256-ZIvWdNxGSUmQtMKB/MVHEZ0fJ8b//zSXz+1r/P9ZDkE="; }; nativeBuildInputs = [ pkg-config ]; From 54b3c061cb98b0449ca30a087dc1ceea0133be6a Mon Sep 17 00:00:00 2001 From: Jered Little Date: Sun, 29 Oct 2023 09:06:31 -0600 Subject: [PATCH 049/206] maintainers: add jl178 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e235b30d7a3b..a00b568cb006 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8340,6 +8340,12 @@ githubId = 3081095; name = "Jürgen Keck"; }; + jl178 = { + email = "jeredlittle1996@gmail.com"; + github = "jl178"; + githubId = 72664723; + name = "Jered Little"; + }; jlamur = { email = "contact@juleslamur.fr"; github = "jlamur"; From 0469c8e35d483bb1d6d381d0d2124f4e42660cd0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 13 Oct 2023 09:09:45 +0200 Subject: [PATCH 050/206] odoo: 16.0.20230722 -> 16.0.20231024 --- pkgs/applications/finance/odoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index f00118fdf75a..abe4dff49f1e 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -45,7 +45,7 @@ let }; odoo_version = "16.0"; - odoo_release = "20230722"; + odoo_release = "20231024"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; @@ -56,7 +56,7 @@ in python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-pSycpYSiqJ6DKENvCWwLz+JaPUXT5dmaq8x4Aency60="; # odoo + hash = "sha256-Ux8RfA7kWLKissBBY5wrfL+aKKw++5BxjP3Vw0JAOsk="; # odoo }; # needs some investigation From b20c401bc5f110e67b9fb3ed842bc40c7062cac3 Mon Sep 17 00:00:00 2001 From: Jered Little Date: Sun, 29 Oct 2023 09:06:37 -0600 Subject: [PATCH 051/206] airlift: init at 0.3.0 --- pkgs/by-name/ai/airlift/package.nix | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ai/airlift/package.nix diff --git a/pkgs/by-name/ai/airlift/package.nix b/pkgs/by-name/ai/airlift/package.nix new file mode 100644 index 000000000000..81ac5acc2efa --- /dev/null +++ b/pkgs/by-name/ai/airlift/package.nix @@ -0,0 +1,48 @@ +{ lib +, python3 +, fetchPypi +, argparse +, kubernetes-helm +, kind +, docker +}: + +python3.pkgs.buildPythonApplication rec { + + pname = "airlift"; + pyproject = true; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-1LE3fpfX4NExJdUdSjt4BXvxQTLJ8zrRkGHkxo/6Pb8="; + }; + buildInputs = [ + kubernetes-helm + kind + docker + ]; + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ + argparse + halo + pyyaml + hiyapyco + jinja2 + dotmap + requests + ]; + pythonImportsCheck = [ + "airlift" + ]; + meta = with lib; { + description = "A flexible, configuration driven CLI for Apache Airflow local development"; + homepage = "https://github.com/jl178/airlift"; + license = licenses.mit; + changelog = "https://github.com/jl178/airlift/releases/tag/v${version}"; + maintainers = with maintainers; [ jl178 ]; + mainProgram = "airlift"; + }; +} From a7ded1859c0ec8a77d11c0154284b025f9b30417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 30 Oct 2023 15:42:34 +0100 Subject: [PATCH 052/206] odoo: update dependencies --- pkgs/applications/finance/odoo/default.nix | 31 +++++++--------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index abe4dff49f1e..c10e0d43686f 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -11,34 +11,18 @@ let python = python310.override { packageOverrides = self: super: { - pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { - version = "1.28.6"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "py-pdf"; - repo = "pypdf"; - rev = version; - fetchSubmodules = true; - hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; - }; - - nativeBuildInputs = []; - - nativeCheckInputs = with self; [ pytestCheckHook pillow ]; - }); flask = super.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; + version = "2.3.3"; src = old.src.override { inherit version; - hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; }); werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.1.2"; + version = "2.3.7"; src = old.src.override { inherit version; - hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; }); }; @@ -69,6 +53,7 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ babel chardet + cryptography decorator docutils ebaysdk @@ -80,7 +65,6 @@ in python.pkgs.buildPythonApplication rec { libsass lxml markupsafe - mock num2words ofxparse passlib @@ -100,13 +84,16 @@ in python.pkgs.buildPythonApplication rec { qrcode reportlab requests - setuptools + urllib3 vobject werkzeug xlrd xlsxwriter xlwt zeep + + setuptools + mock ]; # takes 5+ minutes and there are not files to strip From af99f7c79682cde7bc9f2cf6704949b0700a32e5 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 29 Oct 2023 23:15:00 +0100 Subject: [PATCH 053/206] chickenPackages.chickenEggs.sdl-base: fix build on linux --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 89737e94f489..768ae6d64c41 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -68,7 +68,10 @@ in scheme2c-compatibility = old: addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); - sdl-base = addToBuildInputs pkgs.SDL; + sdl-base = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL old) // + # needed for sdl-config to be in PATH + (addToNativeBuildInputs pkgs.SDL old)); sdl2 = old: ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // # needed for sdl2-config to be in PATH From 8008b57675c9ffc72b6f53100362a13e7a0b49db Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 29 Oct 2023 23:15:00 +0100 Subject: [PATCH 054/206] chickenPackages.chickenEggs.taglib: fix build --- pkgs/development/compilers/chicken/5/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 768ae6d64c41..a5fd3f94830b 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -92,7 +92,10 @@ in stfl = old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old); - taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; + taglib = old: + (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) // ( + # needed for tablib-config to be in PATH + addToNativeBuildInputs pkgs.taglib old); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; From 78ce81f09eca2f8fa6a5e1a9858d213ac09dda35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 01:55:43 +0000 Subject: [PATCH 055/206] marksman: 2023-07-25 -> 2023-10-30 --- pkgs/development/tools/marksman/default.nix | 4 ++-- pkgs/development/tools/marksman/deps.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 6e15d4aa6b6a..2b3a88e75e12 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2023-07-25"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-DxubrZAj2MOF7gUMDl8rW1jGHaw70KGe5Nit1SBQBW8="; + sha256 = "sha256-dAyZIqc9YGuhGydT17s4D1q4CKH6uK5CYW0c0ZJwJAI="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/pkgs/development/tools/marksman/deps.nix b/pkgs/development/tools/marksman/deps.nix index 300fa38e1bec..b6e14d84e5ac 100644 --- a/pkgs/development/tools/marksman/deps.nix +++ b/pkgs/development/tools/marksman/deps.nix @@ -10,7 +10,7 @@ (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; sha256 = "10h58gqfdg2hdy9laf6ry8djfysrdmwlj9n0d7ydwyszb6zgnd20"; }) (fetchNuGet { pname = "FSharpPlus"; version = "1.2.4"; sha256 = "08yg36hgmglll053kkqkkadcfcrdd37qqwqwfwzyrmyqp1mw4mj2"; }) (fetchNuGet { pname = "Glob"; version = "1.1.9"; sha256 = "1q72haq20bf414xwdabsx30lp5c55fjh7hav6r9sp2cqhmva0y53"; }) - (fetchNuGet { pname = "Markdig"; version = "0.30.2"; sha256 = "0m4vjg3kzvknk376yfzazr6i6qkb833s63857a5xcym0l04chlha"; }) + (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) From 3d8ba076a53fa8738c5fe25f565d9eccaf36228c Mon Sep 17 00:00:00 2001 From: Rob <86313040+robert-manchester@users.noreply.github.com> Date: Tue, 31 Oct 2023 00:36:22 -0700 Subject: [PATCH 056/206] tkdiff: patch to trigger recursive inline diffs add patch to fix regression to trigger recursive inline diffs when selected --- pkgs/by-name/tk/tkdiff/194.patch | 15 +++++++++++++++ pkgs/by-name/tk/tkdiff/package.nix | 13 ++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/tk/tkdiff/194.patch diff --git a/pkgs/by-name/tk/tkdiff/194.patch b/pkgs/by-name/tk/tkdiff/194.patch new file mode 100644 index 000000000000..0fc50db3028b --- /dev/null +++ b/pkgs/by-name/tk/tkdiff/194.patch @@ -0,0 +1,15 @@ +Index: tkdiff +=================================================================== +diff --git a/tkdiff b/tkdiff +--- a/tkdiff (revision 193) ++++ b/tkdiff (revision 194) +@@ -4557,7 +4557,8 @@ + } + } + } +- } ++ # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP ++ } { $w(acTxWdg) SEE @1,1 } + } + + ############################################################################### diff --git a/pkgs/by-name/tk/tkdiff/package.nix b/pkgs/by-name/tk/tkdiff/package.nix index 478ee4e29ff9..329b7144202e 100644 --- a/pkgs/by-name/tk/tkdiff/package.nix +++ b/pkgs/by-name/tk/tkdiff/package.nix @@ -9,9 +9,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk="; }; - # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file" - # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk - patches = [ ./189.patch ]; + patches = [ + # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file" + # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk + ./189.patch + + # fix regression: trigger redraw when inline recursive diff requested + # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \ + # sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d' + ./194.patch + ]; nativeBuildInputs = [ makeBinaryWrapper ]; From 4eb94a3220cced05bdd2efecedfe63a090da6016 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Oct 2023 18:27:32 +0000 Subject: [PATCH 057/206] jpeginfo: 1.7.0 -> 1.7.1 --- pkgs/applications/graphics/jpeginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index c63bd78ce987..52f55a629f8a 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpeginfo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-3JhQg0SNlwfULkm+2CaiR8Db2mkTyHDppdm/fHSTllk="; + sha256 = "sha256-J09r4j/Qib2ehxW2dkOmbKL2OlAwKL3qPlcSKNULZp4="; }; buildInputs = [ libjpeg ]; From 6c88874fcbef5f1512458db6ef6b4bb96c603cf6 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 31 Oct 2023 18:38:32 +0100 Subject: [PATCH 058/206] octoprint: fix flask compatibility Signed-off-by: Florian Brandes --- pkgs/applications/misc/octoprint/default.nix | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 810b13afbf2a..e7daa60198d1 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -3,6 +3,7 @@ , callPackage , lib , fetchFromGitHub +, fetchPypi , python3 , substituteAll , nix-update-script @@ -16,6 +17,30 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # Due to flask > 2.3 the login will not work + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = fetchPypi { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + }; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + }); + } + ) + # Built-in dependency ( self: super: { From a4045204ffa8c0b72b233be829cf5cd34c4f1ddf Mon Sep 17 00:00:00 2001 From: merspieler Date: Tue, 31 Oct 2023 23:16:49 +0100 Subject: [PATCH 059/206] qutebrowser: Add pyperclip dependency This allows the qute-bitwarden user script to copy the TOTP token to the clipboard --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 054726f65948..03b03724aeef 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -57,6 +57,8 @@ python3.pkgs.buildPythonApplication { pynacl # extensive ad blocking adblock + # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard + pyperclip ] ++ lib.optional stdenv.isLinux qtwayland ); From c9e2f3d7fe439abb82f15fde1cf23cc9dc12156a Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Wed, 1 Nov 2023 01:07:51 -0300 Subject: [PATCH 060/206] maintainers: add ludat --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 343b75f6c0e2..ed4cd93a7eb8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10458,6 +10458,12 @@ githubId = 2487922; name = "Lars Jellema"; }; + ludat = { + email = "lucas6246@gmail.com"; + github = "ludat"; + githubId = 4952044; + name = "Lucas David Traverso"; + }; ludo = { email = "ludo@gnu.org"; github = "civodul"; From 23ec7571e74f634ceed351359c583549a7476f3a Mon Sep 17 00:00:00 2001 From: Thomas Sowell Date: Tue, 31 Oct 2023 19:50:10 -0800 Subject: [PATCH 061/206] evsieve: 1.3.1 -> 1.4.0 Diff: https://github.com/KarsMulder/evsieve/compare/v1.3.1...v1.4.0 Changelog: https://github.com/KarsMulder/evsieve/releases/tag/v1.4.0 --- pkgs/tools/inputmethods/evsieve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/evsieve/default.nix b/pkgs/tools/inputmethods/evsieve/default.nix index 4497448cad12..de18668e7475 100644 --- a/pkgs/tools/inputmethods/evsieve/default.nix +++ b/pkgs/tools/inputmethods/evsieve/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "evsieve"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "KarsMulder"; repo = "evsieve"; rev = "v${version}"; - hash = "sha256-R/y3iyKGE4dzAyNnDwrMCr8JFshYJwNcgHQ8UbtuRj8="; + hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g="; }; - cargoHash = "sha256-jkm+mAHejCBZFalUbJNaIxtIl2kwnlPR2wsaYlcfSz8="; + cargoHash = "sha256-Bug25xK3YYQ3YjrUXlgWaVUPn87V3N/8XikqwYL/sUg="; buildInputs = [ libevdev ]; From 143680787eb5e885b0d7e2af223c7884cef5ed32 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:55:25 +0100 Subject: [PATCH 062/206] nixos/x11: move extraLayouts into xkb attrset [Motivation](NixOS#257817 (comment)) `extraLayouts` was missed in #259891, so moving it to the other xkb options with this PR. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../manual/configuration/x-windows.chapter.md | 6 +-- .../manual/release-notes/rl-2311.section.md | 2 +- nixos/modules/services/x11/extra-layouts.nix | 42 +++++++++++-------- nixos/tests/keymap.nix | 2 +- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 5a870a46cbb8..0451e4d25265 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -208,7 +208,7 @@ qt.style = "gtk2"; It is possible to install custom [ XKB ](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts -using the option `services.xserver.extraLayouts`. +using the option `services.xserver.xkb.extraLayouts`. As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by @@ -235,7 +235,7 @@ xkb_symbols "us-greek" A minimal layout specification must include the following: ```nix -services.xserver.extraLayouts.us-greek = { +services.xserver.xkb.extraLayouts.us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; symbolsFile = /yourpath/symbols/us-greek; @@ -298,7 +298,7 @@ xkb_symbols "media" As before, to install the layout do ```nix -services.xserver.extraLayouts.media = { +services.xserver.xkb.extraLayouts.media = { description = "Multimedia keys remapping"; languages = [ "eng" ]; symbolsFile = /path/to/media-key; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 74d29ab1cf9c..071d9a135e0f 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -318,7 +318,7 @@ order, or relying on `mkBefore` and `mkAfter`, but may impact users calling `mkOrder n` with n ≤ 400. -- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`. +- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.extraLayouts` is now `services.xserver.xkb.extraLayouts`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`. - `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally. diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 3941f50b7550..ab7e39739eeb 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -3,7 +3,7 @@ with lib; let - layouts = config.services.xserver.extraLayouts; + layouts = config.services.xserver.xkb.extraLayouts; layoutOpts = { options = { @@ -15,10 +15,10 @@ let languages = mkOption { type = types.listOf types.str; description = - lib.mdDoc '' - A list of languages provided by the layout. - (Use ISO 639-2 codes, for example: "eng" for english) - ''; + lib.mdDoc '' + A list of languages provided by the layout. + (Use ISO 639-2 codes, for example: "eng" for english) + ''; }; compatFile = mkOption { @@ -80,29 +80,37 @@ let }; xkb_patched = pkgs.xorg.xkeyboardconfig_custom { - layouts = config.services.xserver.extraLayouts; + layouts = config.services.xserver.xkb.extraLayouts; }; in { + imports = [ + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "extraLayouts" ]; + to = [ "services" "xserver" "xkb" "extraLayouts" ]; + }) + ]; + ###### interface - options.services.xserver = { + options.services.xserver.xkb = { extraLayouts = mkOption { type = types.attrsOf (types.submodule layoutOpts); - default = {}; + default = { }; example = literalExpression - '' - { - mine = { - description = "My custom xkb layout."; - languages = [ "eng" ]; - symbolsFile = /path/to/my/layout; - }; - } - ''; + '' + { + mine = { + description = "My custom xkb layout."; + languages = [ "eng" ]; + symbolsFile = /path/to/my/layout; + }; + } + ''; description = lib.mdDoc '' Extra custom layouts that will be included in the xkb configuration. Information on how to create a new layout can be found here: diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 0e160269304b..e8973a50f852 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -213,7 +213,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { extraConfig.console.useXkbConfig = true; extraConfig.services.xserver.xkb.layout = "us-greek"; - extraConfig.services.xserver.extraLayouts.us-greek = + extraConfig.services.xserver.xkb.extraLayouts.us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; symbolsFile = pkgs.writeText "us-greek" '' From 7d7744f15f8f5eef18abced9551754f2f70436e4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:55:29 +0100 Subject: [PATCH 063/206] pkgs: fix nixosTests command in docs Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/README.md b/pkgs/README.md index 4845cfa31755..642833d968f3 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -568,7 +568,7 @@ This is how the pull request looks like in this case: [https://github.com/NixOS/ To run the main types of tests locally: - Run package-internal tests with `nix-build --attr pkgs.PACKAGE.passthru.tests` -- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTest.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix` +- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTests.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix` - Run [global package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) with `nix-build --attr tests.PACKAGE`, where `PACKAGE` is the name of the test listed in `pkgs/test/default.nix` - See `lib/tests/NAME.nix` for instructions on running specific library tests From 2c83eef4b9197f3ef4e959cef90bdc86952e9870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 14:00:31 +0000 Subject: [PATCH 064/206] kotlin: 1.9.10 -> 1.9.20 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 6fd5b8801927..50b9d0fadee7 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.10"; + version = "1.9.20"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x"; + sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; }; propagatedBuildInputs = [ jre ] ; From 7f9d454a92abaa48fadecde5d2b0fd679df4f1dd Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Wed, 1 Nov 2023 15:12:24 +0100 Subject: [PATCH 065/206] air: 1.46.0 -> 1.49.0 Diff: https://github.com/cosmtrek/air/compare/v1.46.0...v1.49.0 --- pkgs/development/tools/air/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 5c35251a9025..ce51efafdbad 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.46.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-Y5tvCKpcqCkjUOs6awSE5giRKmtofhGypWN1pT7BEXU="; + hash = "sha256-6XQakQXGFMepX29KeiLlGM6EI8tiIfmKQuqZQXYNoto="; }; vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; From b2f5063aeddbe51337b61d9d39fb04675dc49236 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 1 Nov 2023 23:18:45 +0100 Subject: [PATCH 066/206] gnunet-gtk: copy missing logo image --- pkgs/applications/networking/p2p/gnunet/gtk.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index a915e3fed8e0..94504f2b9956 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -38,7 +38,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gnunet=${gnunet}" ]; - patchPhase = "patchShebangs pixmaps/icon-theme-installer"; + postPatch = "patchShebangs pixmaps/icon-theme-installer"; + + postInstall = '' + ln -s $out/share/gnunet-gtk/gnunet_logo.png $out/share/gnunet/gnunet-logo-color.png + ''; meta = gnunet.meta // { description = "GNUnet GTK User Interface"; From 19e047434ce2c125a5cd047dcbbfba8b70ac616b Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Oct 2023 02:05:01 +0300 Subject: [PATCH 067/206] qt5: fix splicing and simplify some things remove now unnecessary use of buildPackages --- .../libraries/qt-5/5.15/default.nix | 39 +++++++------------ .../libraries/qt-5/mkDerivation.nix | 4 +- pkgs/development/libraries/qt-5/qtModule.nix | 6 +-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index e6e6b24360a4..f5e29bc8a54d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -12,7 +12,6 @@ Check for any minor version changes. , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf , darwin -, buildPackages # options , developerBuild ? false @@ -204,28 +203,20 @@ let addPackages = self: with self; let - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; + qtModule = callPackage ../qtModule.nix { + inherit patches; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = + (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; + }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; - mkDerivationWith = - import ../mkDerivation.nix - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; + mkDerivationWith = callPackage ../mkDerivation.nix { }; mkDerivation = mkDerivationWith stdenv.mkDerivation; @@ -318,20 +309,20 @@ let ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); - qmake = makeSetupHook { + qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; - propagatedBuildInputs = [ self.qtbase.dev ]; + propagatedBuildInputs = [ qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; - } ../hooks/qmake-hook.sh; + } ../hooks/qmake-hook.sh) { }; - wrapQtAppsHook = makeSetupHook { + wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; - propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; + propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] + ++ lib.optional stdenv.isLinux qtwayland.dev; + } ../hooks/wrap-qt-apps-hook.sh) { }; }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 98f9a05fac7c..a90e229e688d 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -1,6 +1,4 @@ -{ lib, debug, wrapQtAppsHook }: - -let inherit (lib) optional; in +{ wrapQtAppsHook }: mkDerivation: diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 7322ed51e83e..7d73e652b6ff 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -1,9 +1,7 @@ -{ lib, mkDerivation, perl }: +{ lib, mkDerivation, perl, qmake, patches, srcs }: let inherit (lib) licenses maintainers platforms; in -{ self, srcs, patches }: - args: let @@ -16,7 +14,7 @@ mkDerivation (args // { inherit pname version src; patches = (args.patches or []) ++ (patches.${pname} or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake ]; propagatedBuildInputs = (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ (args.propagatedBuildInputs or []); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcff0c1abea0..f94b6dc4bd3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24656,7 +24656,7 @@ with pkgs; inherit (__splicedPackages) makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper bison cups dconf harfbuzz libGL perl gtk3 python3 - darwin buildPackages; + darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; From bd02bf1ea341f223fe26107ffda41a4abf0b66fd Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Oct 2023 03:15:00 +0300 Subject: [PATCH 068/206] qt5: remove `with self;` The `self` does not contain spliced packages, callPackage works properly. --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index f5e29bc8a54d..8a859af37e9d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -201,7 +201,7 @@ let qttools = [ ./qttools.patch ]; }; - addPackages = self: with self; + addPackages = self: let qtModule = callPackage ../qtModule.nix { inherit patches; @@ -218,7 +218,7 @@ let mkDerivationWith = callPackage ../mkDerivation.nix { }; - mkDerivation = mkDerivationWith stdenv.mkDerivation; + mkDerivation = callPackage ({ mkDerivationWith }: mkDerivationWith stdenv.mkDerivation) { }; qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; @@ -300,7 +300,9 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ + full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { } + # `with self` is ok to use here because having these spliced is unnecessary + (with self; [ qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations From 5220d46c2c13d93d2864597e274a8dcbaf72f683 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Nov 2023 09:06:52 +0100 Subject: [PATCH 069/206] cnspec: 9.4.0 -> 9.5.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v9.4.0...v9.5.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v9.5.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 2b51ba0f7f94..0f4c544f8f48 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.4.0"; + version = "9.5.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-rAvSC+MqgS47n/DFbGoeyvN1GyidvQ37TS+buSYwxME="; + hash = "sha256-XDsZyDTULetUnV0zFn6ZhP/2MJN0gs/HlvWmdeTa0NU="; }; proxyVendor = true; - vendorHash = "sha256-xghScwfR82Q9lhx2cNc1JZShppCKQR+tZynk+ee/81c="; + vendorHash = "sha256-XX+prBSq9mwwnGFBDe2g0un/ZaF+DTXxymq8lfr2xiM="; subPackages = [ "apps/cnspec" From ff77d3c409924c873cfa8dd25d8d99f7acb5467a Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 12 Oct 2023 08:57:30 +0200 Subject: [PATCH 070/206] llama-cpp: init at 1469 --- pkgs/by-name/ll/llama-cpp/package.nix | 130 ++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 pkgs/by-name/ll/llama-cpp/package.nix diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix new file mode 100644 index 000000000000..1c96f5d83a60 --- /dev/null +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -0,0 +1,130 @@ +{ lib +, cmake +, darwin +, fetchFromGitHub +, nix-update-script +, stdenv +, symlinkJoin + +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } + +, rocmSupport ? false +, rocmPackages ? { } + +, openclSupport ? false +, clblast + +, openblasSupport ? true +, openblas +, pkg-config +}: + +let + cudatoolkit_joined = symlinkJoin { + name = "${cudaPackages.cudatoolkit.name}-merged"; + paths = [ + cudaPackages.cudatoolkit.lib + cudaPackages.cudatoolkit.out + ] ++ lib.optionals (lib.versionOlder cudaPackages.cudatoolkit.version "11") [ + # for some reason some of the required libs are in the targets/x86_64-linux + # directory; not sure why but this works around it + "${cudaPackages.cudatoolkit}/targets/${stdenv.system}" + ]; + }; + metalSupport = stdenv.isDarwin && stdenv.isAarch64; +in +stdenv.mkDerivation (finalAttrs: { + pname = "llama-cpp"; + version = "1469"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "llama.cpp"; + rev = "refs/tags/b${finalAttrs.version}"; + hash = "sha256-budBvpX2SnKekGTWHomvhW+4grB8EPd9OJbufNynHsc="; + }; + + postPatch = '' + substituteInPlace ./ggml-metal.m \ + --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" + ''; + + nativeBuildInputs = [ cmake ] ++ lib.optionals openblasSupport [ pkg-config ]; + + buildInputs = lib.optionals metalSupport + (with darwin.apple_sdk.frameworks; [ + Accelerate + CoreGraphics + CoreVideo + Foundation + MetalKit + ]) + ++ lib.optionals cudaSupport [ + cudatoolkit_joined + ] ++ lib.optionals rocmSupport [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.rocblas + ] ++ lib.optionals openclSupport [ + clblast + ] ++ lib.optionals openblasSupport [ + openblas + ]; + + cmakeFlags = [ + "-DLLAMA_NATIVE=OFF" + "-DLLAMA_BUILD_SERVER=ON" + ] + ++ lib.optionals metalSupport [ + "-DCMAKE_C_FLAGS=-D__ARM_FEATURE_DOTPROD=1" + "-DLLAMA_METAL=ON" + ] + ++ lib.optionals cudaSupport [ + "-DLLAMA_CUBLAS=ON" + ] + ++ lib.optionals rocmSupport [ + "-DLLAMA_HIPBLAS=1" + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + ] + ++ lib.optionals openclSupport [ + "-DLLAMA_CLBLAST=ON" + ] + ++ lib.optionals openblasSupport [ + "-DLLAMA_BLAS=ON" + "-DLLAMA_BLAS_VENDOR=OpenBLAS" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for f in bin/*; do + test -x "$f" || continue + cp "$f" $out/bin/llama-cpp-"$(basename "$f")" + done + + ${lib.optionalString metalSupport "cp ./bin/ggml-metal.metal $out/bin/ggml-metal.metal"} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + attrPath = "llama-cpp"; + extraArgs = [ "--version-regex" "b(.*)" ]; + }; + + meta = with lib; { + description = "Port of Facebook's LLaMA model in C/C++"; + homepage = "https://github.com/ggerganov/llama.cpp/"; + license = licenses.mit; + mainProgram = "llama-cpp-main"; + maintainers = with maintainers; [ dit7ya elohmeier ]; + broken = stdenv.isDarwin && stdenv.isx86_64; + platforms = platforms.unix; + }; +}) From ea3a7c56fd076111f0f1afe5b36a9f79c5660c8c Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 26 Oct 2023 09:41:05 +0200 Subject: [PATCH 071/206] ollama: 0.0.17 -> 0.1.7, use llama-cpp --- pkgs/tools/misc/ollama/default.nix | 37 +++++++++++++------ pkgs/tools/misc/ollama/disable-gqa.patch | 15 ++++++++ .../tools/misc/ollama/set-llamacpp-path.patch | 23 ++++++++++++ 3 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/misc/ollama/disable-gqa.patch create mode 100644 pkgs/tools/misc/ollama/set-llamacpp-path.patch diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index be1864024888..30be00d72a15 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -1,35 +1,50 @@ { lib , buildGoModule , fetchFromGitHub +, llama-cpp , stdenv -, darwin }: buildGoModule rec { pname = "ollama"; - version = "0.0.17"; + version = "0.1.7"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-idsFcjsRD1zPmG742gnYQJcgSWDA2DLMHksCFNe2GiY="; + hash = "sha256-rzcuRU2qcYTMo/GxiSHwJYnvA9samfWlztMEhOGzbRg="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Accelerate - MetalPerformanceShaders - MetalKit - ]); + patches = [ + # disable passing the deprecated gqa flag to llama-cpp-server + # see https://github.com/ggerganov/llama.cpp/issues/2975 + ./disable-gqa.patch - vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg="; + # replace the call to the bundled llama-cpp-server with the one in the llama-cpp package + ./set-llamacpp-path.patch + ]; - ldflags = [ "-s" "-w" ]; + postPatch = '' + substituteInPlace llm/llama.go \ + --subst-var-by llamaCppServer "${llama-cpp}/bin/llama-cpp-server" + ''; + + vendorHash = "sha256-Qt5QVqRkwK61BJPVhFWtox6b9E8BpAIseNB0yhh+/90="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/jmorganca/ollama/version.Version=${version}" + "-X=github.com/jmorganca/ollama/server.mode=release" + ]; meta = with lib; { description = "Get up and running with large language models locally"; homepage = "https://github.com/jmorganca/ollama"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + mainProgram = "ollama"; + maintainers = with maintainers; [ dit7ya elohmeier ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/ollama/disable-gqa.patch b/pkgs/tools/misc/ollama/disable-gqa.patch new file mode 100644 index 000000000000..b54440cd3d53 --- /dev/null +++ b/pkgs/tools/misc/ollama/disable-gqa.patch @@ -0,0 +1,15 @@ +diff --git a/llm/llama.go b/llm/llama.go +index 0b460e9..b79e04a 100644 +--- a/llm/llama.go ++++ b/llm/llama.go +@@ -299,10 +299,6 @@ func newLlama(model string, adapters []string, runners []ModelRunner, numLayers + params = append(params, "--n-gpu-layers", fmt.Sprintf("%d", numGPU)) + } + +- if opts.NumGQA > 0 { +- params = append(params, "--gqa", fmt.Sprintf("%d", opts.NumGQA)) +- } +- + if len(adapters) > 0 { + // TODO: applying multiple adapters is not supported by the llama.cpp server yet + params = append(params, "--lora", adapters[0]) diff --git a/pkgs/tools/misc/ollama/set-llamacpp-path.patch b/pkgs/tools/misc/ollama/set-llamacpp-path.patch new file mode 100644 index 000000000000..e90e552bab45 --- /dev/null +++ b/pkgs/tools/misc/ollama/set-llamacpp-path.patch @@ -0,0 +1,23 @@ +diff --git a/llm/llama.go b/llm/llama.go +index f23d5d8..6563550 100644 +--- a/llm/llama.go ++++ b/llm/llama.go +@@ -25,7 +25,6 @@ import ( + "github.com/jmorganca/ollama/api" + ) + +-//go:embed llama.cpp/*/build/*/bin/* + var llamaCppEmbed embed.FS + + type ModelRunner struct { +@@ -33,6 +32,10 @@ type ModelRunner struct { + } + + func chooseRunners(workDir, runnerType string) []ModelRunner { ++ return []ModelRunner{ ++ {Path: "@llamaCppServer@"}, ++ } ++ + buildPath := path.Join("llama.cpp", runnerType, "build") + var runners []string + From d3be93748d81bbf1be364a881dc0284533e420dc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 3 Nov 2023 00:08:14 +1300 Subject: [PATCH 072/206] xulrunner: move to aliases.nix XULRunner was removed from Firefox in 2015. --- .../compilers/adoptopenjdk-icedtea-web/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 26f7d9138cc3..f5645f563de3 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: +{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, firefox-unwrapped, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; - buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; + buildInputs = [ cargo rustc glib firefox-unwrapped zip npapi_sdk ]; preConfigure = '' configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 094416b32af1..816bfcb5e93b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -977,6 +977,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 + xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8e4d22fd626..31c54ffbcbe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41670,8 +41670,6 @@ with pkgs; tora = libsForQt5.callPackage ../development/tools/tora { }; - xulrunner = firefox-unwrapped; - xrq = callPackage ../applications/misc/xrq { }; pynitrokey = callPackage ../tools/security/pynitrokey { }; From e663a72b3d5fd23962cf1e8dc32b87bd2c442a84 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 2 Nov 2023 04:48:44 -0700 Subject: [PATCH 073/206] libuv: disable tests on powerpc64 The libuv tests constantly get stuck during powerpc64le builds. --- pkgs/development/libraries/libuv/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 7be9bee23a25..250b09ecee5d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -93,7 +93,9 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/219466 separateDebugInfo = !stdenv.hostPlatform.isStatic; - doCheck = true; + doCheck = + # routinely hangs on powerpc64le + !stdenv.hostPlatform.isPower64; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From ca07b6d315f1ac35975f32819f8d9f8226037198 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Nov 2023 13:41:39 +0100 Subject: [PATCH 074/206] python311Packages.pyenphase: 1.14.0 -> 1.14.1 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.14.0...v1.14.1 Changelog: https://github.com/pyenphase/pyenphase/blob/1.14.1/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index b968f025d5c8..6e1ab078dd45 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.14.0"; + version = "1.14.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-Eh4OtdOes9ApIlivHkc8zA84pkQ+HBOBp0r+6E8RE8Y="; + hash = "sha256-IK+PaLE2hDLPfxsXqypFXpVYpQH+6VynIq7aGVUZkm4="; }; postPatch = '' From 80e941f28cb880ced7acab8ebed1a2180e84357d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 2 Nov 2023 13:48:35 +0000 Subject: [PATCH 075/206] postfix: enable parallel builds On my 16-core machine the build times change as: - Before: 40s - After: 14s --- pkgs/servers/mail/postfix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index e9dea5282aa9..603024e59e60 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -84,6 +84,8 @@ in stdenv.mkDerivation rec { make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; + enableParallelBuilding = true; + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; installTargets = [ "non-interactive-package" ]; From d07792034f9927f3bd54436c4e86f4e6de295c16 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 2 Nov 2023 09:36:51 -0400 Subject: [PATCH 076/206] typst-lsp: 0.10.1 -> 0.11.0 Diff: https://github.com/nvarner/typst-lsp/compare/v0.10.1...v0.11.0 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.11.0 --- .../language-servers/typst-lsp/Cargo.lock | 1096 ++++++++++------- .../language-servers/typst-lsp/default.nix | 14 +- 2 files changed, 682 insertions(+), 428 deletions(-) diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 52f5b366b420..1cac59554719 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -58,6 +58,15 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -83,9 +92,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "flate2", "futures-core", @@ -96,13 +105,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -146,17 +155,16 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "biblatex" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9fd60378277e44cd400ec5f35e768ce0d5a63d8d18ac7b1a9231196251dae5" +checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" dependencies = [ - "chrono", "numerals", "paste", "strum 0.24.1", @@ -196,18 +204,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] [[package]] -name = "bpaf" -version = "0.9.5" +name = "bitvec" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc3b1bd654a8d16eea03586c3eee8ffd25c7f242b9eae9730cc442834fe56d9" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bpaf" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "565688a36ddfcfc189cc927c94a6b69cc96c9f8a69030151ae8f0ed2b54a2ad3" dependencies = [ "owo-colors", "supports-color", @@ -215,9 +235,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -229,6 +249,28 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytemuck" version = "1.14.0" @@ -237,9 +279,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -258,18 +300,18 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -357,6 +399,16 @@ dependencies = [ "half", ] +[[package]] +name = "citationberg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +dependencies = [ + "quick-xml 0.28.2", + "serde", +] + [[package]] name = "cobs" version = "0.2.3" @@ -392,9 +444,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -415,6 +467,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -445,9 +506,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -457,9 +518,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -475,15 +536,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", + "socket2 0.4.10", "winapi", ] [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -501,7 +562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -509,15 +570,18 @@ dependencies = [ [[package]] name = "data-url" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "dirs" @@ -548,7 +612,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -566,6 +630,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ecow" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" +dependencies = [ + "serde", +] + [[package]] name = "either" version = "1.9.0" @@ -581,6 +654,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -592,15 +671,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -611,25 +690,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -646,6 +714,12 @@ dependencies = [ "regex", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -657,15 +731,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -684,9 +758,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -706,14 +780,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontdb" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" dependencies = [ "log", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -741,10 +815,16 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.28" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -757,9 +837,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -767,15 +847,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -784,9 +864,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -805,32 +885,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -931,29 +1011,30 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "hayagriva" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065e90e53aa502be868a307f58ca6b46e31143641e809047c689de75619d8cea" +checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" dependencies = [ "biblatex", - "chrono", - "isolang", - "lazy_static", - "linked-hash-map", + "ciborium", + "citationberg", + "indexmap 2.1.0", + "numerals", "paste", - "regex", - "strum 0.24.1", + "rkyv", + "serde", + "serde_yaml", "thiserror", "unic-langid", "unicode-segmentation", + "unscanny", "url", - "yaml-rust", ] [[package]] @@ -1019,7 +1100,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1028,9 +1109,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -1055,22 +1136,22 @@ dependencies = [ [[package]] name = "hypher" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e315d77ea8aa1aedf53ad979ff0e763cfa2a1b3403248e427ae052f403cad" +checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1084,9 +1165,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" dependencies = [ "displaydoc", "serde", @@ -1097,9 +1178,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" dependencies = [ "displaydoc", "litemap", @@ -1109,13 +1190,35 @@ dependencies = [ ] [[package]] -name = "icu_properties" -version = "1.2.0" +name = "icu_locid_transform" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_properties" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" dependencies = [ "displaydoc", "icu_collections", + "icu_locid_transform", + "icu_properties_data", "icu_provider", "serde", "tinystr", @@ -1123,10 +1226,16 @@ dependencies = [ ] [[package]] -name = "icu_provider" -version = "1.2.0" +name = "icu_properties_data" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305" +checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" dependencies = [ "displaydoc", "icu_locid", @@ -1134,6 +1243,7 @@ dependencies = [ "postcard", "serde", "stable_deref_trait", + "tinystr", "writeable", "yoke", "zerofrom", @@ -1142,58 +1252,64 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3" +checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" dependencies = [ "icu_locid", + "icu_locid_transform", "icu_provider", "tinystr", - "yoke", "zerovec", ] [[package]] name = "icu_provider_blob" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" dependencies = [ "icu_provider", "postcard", "serde", "writeable", - "yoke", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "icu_segmenter" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3300a7b6bf187be98a57264ad094f11f2e062c2e8263132af010ff522ee5495" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" dependencies = [ + "core_maths", "displaydoc", "icu_collections", "icu_locid", "icu_provider", - "num-traits", + "icu_segmenter_data", "serde", "utf8_iter", "zerovec", ] +[[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + [[package]] name = "idna" version = "0.4.0" @@ -1244,12 +1360,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "serde", ] @@ -1276,9 +1392,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "internment" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161079c3ad892faa215fcfcf3fd7a6a3c9288df2b06a2c2bad7fbfad4f01d69d" +checksum = "5e976188335292f66a1533fd41d5c2ce24b32dc2c000569b8dccf4e57f489806" dependencies = [ "hashbrown 0.12.3", "parking_lot", @@ -1286,9 +1402,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -1332,15 +1448,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "isolang" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80f221db1bc708b71128757b9396727c04de86968081e18e89b0575e03be071" -dependencies = [ - "phf", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1397,15 +1504,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" @@ -1436,9 +1543,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lipsum" @@ -1452,15 +1559,15 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1487,15 +1594,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -1518,9 +1625,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -1579,12 +1686,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1612,15 +1718,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oklab" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" -dependencies = [ - "rgb", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -1633,7 +1730,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -1650,7 +1747,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1750,7 +1847,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.9.1", + "ordered-float 3.9.2", "percent-encoding", "rand", "regex", @@ -1767,18 +1864,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -1790,10 +1887,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] -name = "parking" -version = "2.1.0" +name = "palette" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "libm", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1807,13 +1927,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1826,12 +1946,13 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d77bc47c8968aa63f86a7e6693e270a6cbd1e3b784c364f1711a0ddecc71447" +checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" dependencies = [ "bitflags 1.3.2", "itoa", + "memchr", "ryu", ] @@ -1841,24 +1962,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - [[package]] name = "pico-args" version = "0.5.0" @@ -1882,7 +1985,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1903,7 +2006,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" dependencies = [ - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -1914,14 +2017,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ "base64", "indexmap 1.9.3", "line-wrap", - "quick-xml", + "quick-xml 0.30.0", "serde", "time", ] @@ -1957,14 +2060,21 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d534c6e61df1c7166e636ca612d9820d486fe96ddad37f7abc671517b297488e" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", + "embedded-io", "serde", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1997,9 +2107,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2014,10 +2124,40 @@ dependencies = [ ] [[package]] -name = "quick-xml" -version = "0.29.0" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2031,6 +2171,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" @@ -2085,6 +2231,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -2098,25 +2253,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] @@ -2126,10 +2281,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "reqwest" -version = "0.11.20" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -2155,6 +2325,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -2171,9 +2342,9 @@ dependencies = [ [[package]] name = "resvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" dependencies = [ "gif", "jpeg-decoder", @@ -2188,33 +2359,60 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -2227,11 +2425,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2240,9 +2438,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", @@ -2261,9 +2459,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -2277,17 +2475,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.18.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category", + "unicode-properties", "unicode-script", ] @@ -2329,14 +2527,20 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" version = "2.9.2" @@ -2362,38 +2566,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2402,20 +2606,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2434,11 +2638,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -2447,9 +2651,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2460,6 +2664,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "simplecss" version = "0.2.1" @@ -2518,9 +2728,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -2528,20 +2738,14 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", ] -[[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" @@ -2591,7 +2795,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", + "strum_macros 0.25.3", ] [[package]] @@ -2609,15 +2813,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2638,9 +2842,9 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2adc7de163bd53f323850e65269280b2a66ffceee291cb8eca34f2eabc3acad" +checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" dependencies = [ "image", "miniz_oxide", @@ -2650,9 +2854,9 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", "siphasher 0.3.11", @@ -2671,9 +2875,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2682,13 +2886,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "unicode-xid", ] @@ -2705,7 +2909,7 @@ dependencies = [ "fnv", "once_cell", "plist", - "regex-syntax", + "regex-syntax 0.7.5", "serde", "serde_json", "thiserror", @@ -2713,6 +2917,33 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "temp-dir" version = "0.1.11" @@ -2721,35 +2952,35 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", + "fastrand 2.0.1", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2780,18 +3011,19 @@ dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float 2.10.0", + "ordered-float 2.10.1", "threadpool", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2799,24 +3031,24 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] name = "tiny-skia" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" dependencies = [ "arrayref", "arrayvec", @@ -2829,9 +3061,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" dependencies = [ "arrayref", "bytemuck", @@ -2840,9 +3072,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", "serde", @@ -2866,9 +3098,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2876,7 +3108,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] @@ -2889,7 +3121,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2940,9 +3172,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2966,21 +3198,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.0", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -2991,7 +3223,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3000,11 +3232,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3062,7 +3294,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3073,11 +3305,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3086,20 +3317,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -3117,12 +3348,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -3159,12 +3390,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - [[package]] name = "ttf-parser" version = "0.19.2" @@ -3179,23 +3404,23 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "base64", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", "comemo", - "ecow", + "ecow 0.2.0", "flate2", "fontdb", - "if_chain", "image", - "indexmap 2.0.0", + "indexmap 2.1.0", + "kurbo", "log", "miniz_oxide", - "oklab", "once_cell", + "palette", "pdf-writer", "pixglyph", "regex", @@ -3209,11 +3434,11 @@ dependencies = [ "svg2pdf", "time", "tiny-skia", - "toml 0.8.0", + "toml 0.8.6", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typst-macros", - "typst-syntax 0.8.0", + "typst-syntax 0.9.0", "unicode-ident", "unicode-math-class", "unicode-properties", @@ -3226,17 +3451,31 @@ dependencies = [ "xmp-writer", ] +[[package]] +name = "typst-ide" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +dependencies = [ + "comemo", + "ecow 0.2.0", + "if_chain", + "log", + "serde", + "typst", + "unscanny", +] + [[package]] name = "typst-library" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "az", "chinese-number", "ciborium", "comemo", "csv", - "ecow", + "ecow 0.2.0", "hayagriva", "hypher", "icu_properties", @@ -3244,6 +3483,7 @@ dependencies = [ "icu_provider_adapters", "icu_provider_blob", "icu_segmenter", + "indexmap 2.1.0", "kurbo", "lipsum", "log", @@ -3255,9 +3495,9 @@ dependencies = [ "smallvec", "syntect", "time", - "toml 0.8.0", + "toml 0.8.6", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typed-arena", "typst", "unicode-bidi", @@ -3268,7 +3508,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.10.1" +version = "0.11.0" dependencies = [ "anyhow", "async-compression", @@ -3281,7 +3521,7 @@ dependencies = [ "elsa", "futures", "if_chain", - "indexmap 2.0.0", + "indexmap 2.1.0", "internment", "itertools 0.11.0", "lazy_static", @@ -3308,6 +3548,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "typst", + "typst-ide", "typst-library", "typstfmt_lib", "walkdir", @@ -3315,13 +3556,13 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3330,7 +3571,7 @@ version = "0.7.0" source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "comemo", - "ecow", + "ecow 0.1.2", "once_cell", "serde", "tracing", @@ -3342,11 +3583,11 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "comemo", - "ecow", + "ecow 0.2.0", "once_cell", "serde", "tracing", @@ -3358,8 +3599,8 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.5" -source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.5#98b08f5ab033e657c8e81f95c86b111f4fd662a4" +version = "0.2.6" +source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.6#b45cab03ac76e621ef1174160d03c4f7637a82df" dependencies = [ "globmatch", "itertools 0.10.5", @@ -3386,6 +3627,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" dependencies = [ + "serde", "tinystr", ] @@ -3407,12 +3649,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" -[[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -3478,9 +3714,9 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" @@ -3502,9 +3738,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" dependencies = [ "base64", "log", @@ -3517,9 +3753,9 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" dependencies = [ "data-url", "flate2", @@ -3535,9 +3771,9 @@ dependencies = [ [[package]] name = "usvg-text-layout" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ "fontdb", "kurbo", @@ -3551,9 +3787,9 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" dependencies = [ "rctree", "strict-num", @@ -3567,6 +3803,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" + [[package]] name = "valuable" version = "0.1.0" @@ -3587,9 +3829,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -3637,7 +3879,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3671,7 +3913,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3702,7 +3944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" dependencies = [ "smallvec", - "spin 0.9.8", + "spin", "wasmi_arena", "wasmi_core", "wasmparser-nostd", @@ -3789,10 +4031,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -3865,9 +4107,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] @@ -3884,9 +4126,18 @@ dependencies = [ [[package]] name = "writeable" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] [[package]] name = "xattr" @@ -3899,9 +4150,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -3911,9 +4162,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd742bbbb930fc972b28bf66b7546dfbc7bb9a4c7924299df0ae6a5641fcadf" +checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" [[package]] name = "yaml-rust" @@ -3926,9 +4177,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" dependencies = [ "serde", "stable_deref_trait", @@ -3938,42 +4189,42 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af46c169923ed7516eef0aa32b56d2651b229f57458ebe46b49ddd6efef5b7a2" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] name = "zerofrom" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae7c1f7d4b8eafce526bc0771449ddc2f250881ae31c50d22c032b5a1c499" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] name = "zerovec" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" dependencies = [ "serde", "yoke", @@ -3983,12 +4234,11 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486558732d5dde10d0f8cb2936507c1bb21bc539d924c949baf5f36a58e51bac" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.38", ] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index b3c1db287e27..5cd6b423aa0c 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -9,31 +9,35 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-ZQLxZzWVGwFtU68ASlzBDMz8RHrA0h925u6UDk7vPe4="; + hash = "sha256-L0d+fDCLxU/XHC99VlIcZdiO3RohtWfoRnUPGIHodcc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA="; + "typst-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.5" = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag="; + "typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; }; }; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; checkFlags = [ # requires internet access "--skip=workspace::package::external::remote_repo::test::full_download" + ] ++ lib.optionals stdenv.isDarwin [ + # both tests fail on darwin with 'Attempted to create a NULL object.' + "--skip=workspace::fs::local::test::read" + "--skip=workspace::package::external::manager::test::local_package" ]; # workspace::package::external::manager::test::local_package tries to access the data directory From b267851685c0fd727120865b8748c8d2440b1b15 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 2 Nov 2023 09:40:58 -0400 Subject: [PATCH 077/206] vscode-extensions.nvarner.typst-lsp: 0.10.1 -> 0.11.0 --- 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 6d5142fe6d6d..5f3f82dd8ab0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2735,8 +2735,8 @@ let publisher = "nvarner"; # Please update the corresponding binary (typst-lsp) when updating # this extension. - version = "0.10.1"; - sha256 = "sha256-+LOw9JPpL5eLNxmP4kyPo9S/w8ZxfPGSaY1oR8THmvI="; + version = "0.11.0"; + sha256 = "sha256-fs+CBg3FwzTn608dm9EvfF2UrI2Sa5hsm0OK/WQyy6o="; }; nativeBuildInputs = [ jq moreutils ]; From eedc941361fb1ac1f7c3d240f38b933c41958a59 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Thu, 2 Nov 2023 15:51:13 +0100 Subject: [PATCH 078/206] nixdoc: 2.4.0 -> 2.5.1 --- pkgs/tools/nix/nixdoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 25771a135bc8..f7f6f4e04dbf 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-cEMehtxkqXAar/fDy3CnzsDEAuC1ABBaYqzqVBGnTrs="; + sha256 = "sha256-QgKzpFdzisWD6DZxs1LsKINBr/bSYQILpEu5RdcNgbc="; }; - cargoHash = "sha256-QFDHIqXyTWTdqNrLcwWw3plX6EDH/k043nay5opjtws="; + cargoHash = "sha256-MztvOV1yAOgpwPYOUUZb7XHKhhhd/fvKPIFbsnMdhAQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; From ae53abaa2e1b0f2d65a04c9b2686683654475bc1 Mon Sep 17 00:00:00 2001 From: Zhenbo Li Date: Tue, 31 Oct 2023 19:23:57 -0400 Subject: [PATCH 079/206] ArchiSteamFarm: add darwin as supported platforms --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 1a0e90546bec..049f4e90b29b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -76,7 +76,6 @@ buildDotnetModule rec { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "ArchiSteamFarm"; maintainers = with maintainers; [ SuperSandro2000 lom ]; }; From afa72f5d9754dae3aae9180b28a3ad525ab5946b Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Thu, 2 Nov 2023 11:16:48 -0600 Subject: [PATCH 080/206] wasm-bindgen-cli: 0.2.87 -> 0.2.88 Closes: #265059 --- pkgs/development/tools/wasm-bindgen-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index d7b6aba2a2a3..c87f49aa7cb4 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -7,9 +7,9 @@ , stdenv , curl , Security -, version ? "0.2.87" -, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0=" -, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko=" +, version ? "0.2.88" +, hash ? "sha256-CpyB2poKIqP4Zfn3Gk1hA9m6EQ/ZiyO91wZViMH7Wsk=" +, cargoHash ? "sha256-0D5ABJ3jwsrFIvXSOYgOqJtV5B9JUsHZfJEKl6PO47I=" }: rustPlatform.buildRustPackage rec { From 6e7bf9e941b65fee40e5c8b93de95b052d62771b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 18:44:18 +0000 Subject: [PATCH 081/206] avalanchego: 1.10.11 -> 1.10.15 --- pkgs/applications/networking/avalanchego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 7e79064833a4..e2673068dcb3 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.11"; + version = "1.10.15"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-6eebc8+SsonTngOIM5C+cxqzhFSLK5wLB/sBhVQuTQ4="; + hash = "sha256-vx9Vfbdxd3Y0fdjpKC6LFAUEej1RHszyM5GUUGKy0zU="; }; - vendorHash = "sha256-sBoH/0SQtHO/fgyfve4bpy74GIS8qWr6KcIQyOnkgkI="; + vendorHash = "sha256-br/z6k1D1r9JEECKNy7BOZzfHaaveCMUA1bKos0+p0Q="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; From 73b624bc5039de2d87605bb0300a3257b29b8381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 18:49:08 +0000 Subject: [PATCH 082/206] ergochat: 2.11.1 -> 2.12.0 --- pkgs/servers/irc/ergochat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index 50fa9951a901..d7613c9a8a06 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-LBKGwtprhtDHaghnU6YPQ4Pf2fqD8VN7OV9gzvFgLPY="; + sha256 = "sha256-n7GJpR/zUsHxTeVmHfBTjMcMAN7ri3FDvJSkKMzPe2I="; }; vendorHash = null; From c7b48c75c8a53b3cbbcf24bb310ed142b9c13198 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Nov 2023 14:23:36 -0500 Subject: [PATCH 083/206] fastfetch: fix uninitialized error --- pkgs/tools/misc/fastfetch/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 77eeaeaf6702..4cf37d0a8e5e 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -101,6 +101,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_SYSTEM_YYJSON=YES" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=uninitialized" + ]; + postInstall = '' wrapProgram $out/bin/fastfetch \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" From a18d8396867bf7c001635df2a8b1a68211b26d7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 19:55:48 +0000 Subject: [PATCH 084/206] granted: 0.18.0 -> 0.19.2 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 6e48f468c4d8..65084dcedeb4 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.18.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BvrMfQ/fiAMJCROwOqzt17ae/qqDC2KFdBK2epVImus="; + sha256 = "sha256-z8j44WFLzPDpnmQ/vG8DfpjpxnNd942mPUxoXSEJDeI="; }; - vendorHash = "sha256-vHOGnflLC85hrONPPAAuuaPxNkv3t5T616nAnDEZbAY="; + vendorHash = "sha256-cn1rGmjrmPSo6v4TD72I01VbQjwt6dT7ZEijPOjp+kc="; nativeBuildInputs = [ makeWrapper ]; From 51c024de6534f6eeefd589df9c6346f2324192a2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Nov 2023 14:56:37 -0500 Subject: [PATCH 085/206] apple-sdk-11.0: add Apple80211 private framework --- pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index f95932516d20..4566c8af84f5 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -2,6 +2,7 @@ # generated by hand to avoid exposing all private frameworks # frameworks here are only the necessary ones used by public frameworks. { + Apple80211 = {}; AVFCapture = {}; AVFCore = {}; AddressBookCore = { inherit ContactsPersistence; }; From 160ba578a7f0d47219d631edda14370c497621b8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Nov 2023 14:56:52 -0500 Subject: [PATCH 086/206] fastfetch: fix darwin build --- pkgs/tools/misc/fastfetch/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 4cf37d0a8e5e..f10da6e92962 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -27,6 +27,7 @@ , xfce , yyjson , zlib +, Apple80211 , AppKit , Cocoa , CoreDisplay @@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.isDarwin [ + Apple80211 AppKit Cocoa CoreDisplay diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758ea117d4ae..a1dc3e213eec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1765,7 +1765,7 @@ with pkgs; fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch { inherit (darwin.apple_sdk_11_0.frameworks) - AppKit Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices + AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices Foundation IOBluetooth MediaRemote OpenCL; inherit (darwin) moltenvk; From 2562ebd535cb75787c7c6371405b7134923cd97d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Nov 2023 14:23:58 -0500 Subject: [PATCH 087/206] fastfetch: 2.2.0 -> 2.2.1 --- pkgs/tools/misc/fastfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index f10da6e92962..ced223496bf4 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-H2iIL41h3o8184S/XMYAuIDPVJPm+zSI/YX8FT8vLio="; + hash = "sha256-7g2p33j97hu26xwBLrakc7/bIpYHNTC5jqCj/Fs4fKo="; }; nativeBuildInputs = [ From 4609443e35eb5673a535804b72fa52db5760ebdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 21:10:52 +0000 Subject: [PATCH 088/206] noto-fonts: 23.8.1 -> 23.11.1 --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index f0a22fde9264..86565615534c 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -35,13 +35,13 @@ rec { }: stdenvNoCC.mkDerivation rec { inherit pname; - version = "23.8.1"; + version = "23.11.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-TYCJzioZcNFV8N5wLr7Fo69g/p5GQF/tbGgYoLUV7Us="; + hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; From 92e191bf9ec398edabf5355576c4ff355615ff1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 22:40:49 +0000 Subject: [PATCH 089/206] oelint-adv: 3.26.1 -> 3.26.2 --- pkgs/by-name/oe/oelint-adv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index f77ca05a6345..6aa02d62fe2b 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "3.26.1"; + version = "3.26.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-xQC3y9YeY8o4L4pLV+nLs1Ao8KH6q1BprwTeUm8f+2w="; + hash = "sha256-tR4CB4i91XHoyFtZH1LsDxVI791v0LCtvCd28Ahlxlc="; }; propagatedBuildInputs = with python3.pkgs; [ From 80f60a21109bb0fe3b28c4801ea6b8f95d0f3841 Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Thu, 2 Nov 2023 17:07:48 -0600 Subject: [PATCH 090/206] maintainers: add iogamaster --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 40bebe6285c5..5715f109f9c4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7658,6 +7658,12 @@ githubId = 88038050; name = "Souvik Sen"; }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "iogamaster"; + githubId = 67164465; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; From ac16e103e1704b46d933c60d130537a563158f76 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 2 Nov 2023 18:52:05 -0400 Subject: [PATCH 091/206] vesktop: fix aarch64-linux builds --- pkgs/by-name/ve/vesktop/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 52c21e75f7b1..67f022e0e10b 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -53,7 +53,10 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-KDJ8QmpwGb2lOdwWEl5y62pJiqEvpI59StfQZrN1PPE="; + outputHash = { + "aarch64-linux" = "sha256-Fkfq8vBfNXdndVb17aZOTvIOAyiccDzyuFvg6kDy7QI="; + "x86_64-linux" = "sha256-KDJ8QmpwGb2lOdwWEl5y62pJiqEvpI59StfQZrN1PPE="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; nativeBuildInputs = [ @@ -105,7 +108,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/opt/Vesktop/resources - cp dist/linux-unpacked/resources/app.asar $out/opt/Vesktop/resources + cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources pushd build ${libicns}/bin/icns2png -x icon.icns @@ -141,6 +144,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; - broken = stdenv.hostPlatform.isAarch64; }; } From 67006f41c2dc8631998ad19ff1eb10ea2d1999d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Nov 2023 00:31:23 +0100 Subject: [PATCH 092/206] esphome: 2023.10.5 -> 2023.10.6 https://github.com/esphome/esphome/releases/tag/2023.10.6 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index ef6e0f1de6ed..8413dde76961 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.10.5"; + version = "2023.10.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I/VA1/vw0WrTsLC1F3IrKYf8lmTJHLG/RYj3VcJx+Zc="; + hash = "sha256-GqZSQVQnxLj0JrUrCMB5+RmxcJRU6ErIDGP8WaMolXk="; }; postPatch = '' From 6a8927c72a9ffdb31282100d8544d94c79fa5a0e Mon Sep 17 00:00:00 2001 From: EsAu79p Date: Sat, 30 Sep 2023 12:49:41 +0200 Subject: [PATCH 093/206] unsilence: init at 1.0.9 --- pkgs/by-name/un/unsilence/package.nix | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/un/unsilence/package.nix diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix new file mode 100644 index 000000000000..a8c9ef1d9c95 --- /dev/null +++ b/pkgs/by-name/un/unsilence/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3Packages +, ffmpeg +, +}: +python3Packages.buildPythonPackage rec { + pname = "unsilence"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "lagmoellertim"; + repo = "unsilence"; + rev = version; + sha256 = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; + }; + + nativeBuildInputs = with python3Packages; [ + rich + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + python3Packages.rich + python3Packages.setuptools # imports pkg_resources.parse_version + ]; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; + + doCheck = false; + pythonImportsCheck = [ "unsilence" ]; + + pythonRelaxDeps = [ "rich" ]; + + meta = with lib; { + homepage = "https://github.com/lagmoellertim/unsilence"; + description = "Console Interface and Library to remove silent parts of a media file"; + license = licenses.mit; + maintainers = with maintainers; [ esau79p ]; + }; +} From fb8efafdea75ba589c89df9b972c04065c11b302 Mon Sep 17 00:00:00 2001 From: Snowflake Date: Fri, 3 Nov 2023 07:48:51 +0800 Subject: [PATCH 094/206] maintainers: add snowflake --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a970f9363a60..64627b6d1aba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16542,6 +16542,16 @@ github = "SnO2WMaN"; githubId = 15155608; }; + snowflake = { + email = "snowflake@pissmail.com"; + name = "Snowflake"; + github = "snf1k"; + githubId = 149651684; + matrix = "@snowflake:mozilla.org"; + keys = [{ + fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; + }]; + }; snpschaaf = { email = "philipe.schaaf@secunet.com"; name = "Philippe Schaaf"; From 29487f181faaa0a5cb418b762a7e550d85ac507c Mon Sep 17 00:00:00 2001 From: Snowflake Date: Fri, 3 Nov 2023 07:49:18 +0800 Subject: [PATCH 095/206] guile-aspell: init at 0.5.0 --- pkgs/by-name/gu/guile-aspell/package.nix | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/gu/guile-aspell/package.nix diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix new file mode 100644 index 000000000000..cf5e51e2540b --- /dev/null +++ b/pkgs/by-name/gu/guile-aspell/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, guile +, autoreconfHook +, pkg-config +, aspell +, texinfo +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-aspell"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "spk121"; + repo = "guile-aspell"; + rev = finalAttrs.version; + hash = "sha256-CvLECZLwf4MujAQCL3I81O5xFvq6ezVhV0BjbqI3mR0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + guile + autoreconfHook + pkg-config + texinfo + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + aspell + ]; + + meta = with lib; { + description = "Guile bindings for the aspell library"; + homepage = "https://github.com/spk121/guile-aspell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ snowflake ]; + platforms = guile.meta.platforms; + }; +}) From 1fff6a90316002764fee541e9ffa1bc7a9552521 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 20 Oct 2023 00:10:59 -0400 Subject: [PATCH 096/206] nixos/incus: init module and tests --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/incus.nix | 232 ++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/incus/container.nix | 76 +++++++ nixos/tests/incus/default.nix | 14 ++ nixos/tests/incus/preseed.nix | 65 ++++++ nixos/tests/incus/socket-activated.nix | 25 +++ nixos/tests/incus/virtual-machine.nix | 55 +++++ pkgs/by-name/co/cowsql/package.nix | 4 +- pkgs/by-name/in/incus-unwrapped/package.nix | 3 + pkgs/by-name/in/incus/package.nix | 2 + pkgs/by-name/ra/raft-cowsql/package.nix | 9 +- 12 files changed, 481 insertions(+), 6 deletions(-) create mode 100644 nixos/modules/virtualisation/incus.nix create mode 100644 nixos/tests/incus/container.nix create mode 100644 nixos/tests/incus/default.nix create mode 100644 nixos/tests/incus/preseed.nix create mode 100644 nixos/tests/incus/socket-activated.nix create mode 100644 nixos/tests/incus/virtual-machine.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bfac651f5a81..55c74bc327da 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1506,6 +1506,7 @@ ./virtualisation/docker.nix ./virtualisation/ecs-agent.nix ./virtualisation/hyperv-guest.nix + ./virtualisation/incus.nix ./virtualisation/kvmgt.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix new file mode 100644 index 000000000000..d7ccc963f6a6 --- /dev/null +++ b/nixos/modules/virtualisation/incus.nix @@ -0,0 +1,232 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.virtualisation.incus; + preseedFormat = pkgs.formats.yaml { }; +in +{ + meta.maintainers = [ lib.maintainers.adamcstephens ]; + + options = { + virtualisation.incus = { + enable = lib.mkEnableOption (lib.mdDoc '' + incusd, a daemon that manages containers and virtual machines. + + Users in the "incus-admin" group can interact with + the daemon (e.g. to start or stop containers) using the + {command}`incus` command line tool, among others. + ''); + + package = lib.mkPackageOptionMD pkgs "incus" { }; + + lxcPackage = lib.mkPackageOptionMD pkgs "lxc" { }; + + preseed = lib.mkOption { + type = lib.types.nullOr ( + lib.types.submodule { freeformType = preseedFormat.type; } + ); + + default = null; + + description = lib.mdDoc '' + Configuration for Incus preseed, see + + for supported values. + + Changes to this will be re-applied to Incus which will overwrite existing entities or create missing ones, + but entities will *not* be removed by preseed. + ''; + + example = { + networks = [ + { + name = "incusbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "incusbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "default"; + driver = "dir"; + config = { + source = "/var/lib/incus/storage-pools/default"; + }; + } + ]; + }; + }; + + socketActivation = lib.mkEnableOption ( + lib.mdDoc '' + socket-activation for starting incus.service. Enabling this option + will stop incus.service from starting automatically on boot. + '' + ); + + startTimeout = lib.mkOption { + type = lib.types.ints.unsigned; + default = 600; + apply = toString; + description = lib.mdDoc '' + Time to wait (in seconds) for incusd to become ready to process requests. + If incusd does not reply within the configured time, `incus.service` will be + considered failed and systemd will attempt to restart it. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + # https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md + boot.kernel.sysctl = { + "fs.aio-max-nr" = lib.mkDefault 524288; + "fs.inotify.max_queued_events" = lib.mkDefault 1048576; + "fs.inotify.max_user_instances" = lib.mkOverride 1050 1048576; # override in case conflict nixos/modules/services/x11/xserver.nix + "fs.inotify.max_user_watches" = lib.mkOverride 1050 1048576; # override in case conflict nixos/modules/services/x11/xserver.nix + "kernel.dmesg_restrict" = lib.mkDefault 1; + "kernel.keys.maxbytes" = lib.mkDefault 2000000; + "kernel.keys.maxkeys" = lib.mkDefault 2000; + "net.core.bpf_jit_limit" = lib.mkDefault 1000000000; + "net.ipv4.neigh.default.gc_thresh3" = lib.mkDefault 8192; + "net.ipv6.neigh.default.gc_thresh3" = lib.mkDefault 8192; + # vm.max_map_count is set higher in nixos/modules/config/sysctl.nix + }; + + boot.kernelModules = [ + "veth" + "xt_comment" + "xt_CHECKSUM" + "xt_MASQUERADE" + "vhost_vsock" + ] ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ]; + + environment.systemPackages = [ cfg.package ]; + + # Note: the following options are also declared in virtualisation.lxc, but + # the latter can't be simply enabled to reuse the formers, because it + # does a bunch of unrelated things. + systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; + + security.apparmor = { + packages = [ cfg.lxcPackage ]; + policies = { + "bin.lxc-start".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers + ''; + }; + }; + + systemd.services.incus = { + description = "Incus Container and Virtual Machine Management Daemon"; + + wantedBy = lib.mkIf (!cfg.socketActivation) [ "multi-user.target" ]; + after = [ + "network-online.target" + "lxcfs.service" + ] ++ (lib.optional cfg.socketActivation "incus.socket"); + requires = [ + "lxcfs.service" + ] ++ (lib.optional cfg.socketActivation "incus.socket"); + wants = [ + "network-online.target" + ]; + + path = lib.mkIf config.boot.zfs.enabled [ config.boot.zfs.package ]; + + environment = { + # Override Path to the LXC template configuration directory + INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; + ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; + + KillMode = "process"; # when stopping, leave the containers alone + Delegate = "yes"; + LimitMEMLOCK = "infinity"; + LimitNOFILE = "1048576"; + LimitNPROC = "infinity"; + TasksMax = "infinity"; + + Restart = "on-failure"; + TimeoutStartSec = "${cfg.startTimeout}s"; + TimeoutStopSec = "30s"; + }; + }; + + systemd.sockets.incus = lib.mkIf cfg.socketActivation { + description = "Incus UNIX socket"; + wantedBy = [ "sockets.target" ]; + + socketConfig = { + ListenStream = "/var/lib/incus/unix.socket"; + SocketMode = "0660"; + SocketGroup = "incus-admin"; + Service = "incus.service"; + }; + }; + + systemd.services.incus-preseed = lib.mkIf (cfg.preseed != null) { + description = "Incus initialization with preseed file"; + wantedBy = [ "multi-user.target" ]; + requires = [ "incus.service" ]; + after = [ "incus.service" ]; + + script = '' + ${cfg.package}/bin/incus admin init --preseed <${ + preseedFormat.generate "incus-preseed.yaml" cfg.preseed + } + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; + + users.groups.incus-admin = { }; + + users.users.root = { + # match documented default ranges https://linuxcontainers.org/incus/docs/main/userns-idmap/#allowed-ranges + subUidRanges = [ + { + startUid = 1000000; + count = 1000000000; + } + ]; + subGidRanges = [ + { + startGid = 1000000; + count = 1000000000; + } + ]; + }; + + virtualisation.lxc.lxcfs.enable = true; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2f6d5a8dae88..69549c8d5349 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -392,6 +392,7 @@ in { icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; incron = handleTest ./incron.nix {}; + incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); influxdb = handleTest ./influxdb.nix {}; influxdb2 = handleTest ./influxdb2.nix {}; initrd-network-openvpn = handleTest ./initrd-network-openvpn {}; diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix new file mode 100644 index 000000000000..ce9a8a10fb25 --- /dev/null +++ b/nixos/tests/incus/container.nix @@ -0,0 +1,76 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + + container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; +in +{ + name = "incus-container"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { ... }: { + virtualisation = { + # Ensure test VM has enough resources for creating and managing guests + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus.enable = true; + }; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + machine.wait_for_unit("incus.service") + + # no preseed should mean no service + machine.fail("systemctl status incus-preseed.service") + + machine.succeed("incus admin init --minimal") + + with subtest("Container image can be imported"): + machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos") + + with subtest("Container can be launched and managed"): + machine.succeed("incus launch nixos container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -") + + with subtest("Container CPU limits can be managed"): + machine.succeed("incus config set container limits.cpu 1") + # give container a chance to apply new resource limit + machine.sleep(1) + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" + + machine.succeed("incus config set container limits.cpu 2") + machine.sleep(1) + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" + + with subtest("Container memory limits can be managed"): + machine.succeed("incus config set container limits.memory 64MB") + machine.sleep(1) + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + + machine.succeed("incus config set container limits.memory 128MB") + machine.sleep(1) + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + ''; +}) diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix new file mode 100644 index 000000000000..c88974605e30 --- /dev/null +++ b/nixos/tests/incus/default.nix @@ -0,0 +1,14 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, + handleTestOn, +}: +{ + container = import ./container.nix { inherit system pkgs; }; + preseed = import ./preseed.nix { inherit system pkgs; }; + socket-activated = import ./socket-activated.nix { inherit system pkgs; }; + virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { + inherit system pkgs; + }; +} diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix new file mode 100644 index 000000000000..19ec3889093c --- /dev/null +++ b/nixos/tests/incus/preseed.nix @@ -0,0 +1,65 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +{ + name = "incus-preseed"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + incus.enable = true; + + incus.preseed = { + networks = [ + { + name = "nixostestbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "nixostest_default"; + devices = { + eth0 = { + name = "eth0"; + network = "nixostestbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "nixostest_pool"; + driver = "dir"; + } + ]; + }; + }; + }; + + testScript = '' + def wait_for_preseed(_) -> bool: + _, output = machine.systemctl("is-active incus-preseed.service") + return ("inactive" in output) + + machine.wait_for_unit("incus.service") + with machine.nested("Waiting for preseed to complete"): + retry(wait_for_preseed) + + with subtest("Verify preseed resources created"): + machine.succeed("incus profile show nixostest_default") + machine.succeed("incus network info nixostestbr0") + machine.succeed("incus storage show nixostest_pool") + ''; +}) diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix new file mode 100644 index 000000000000..e48831cd3cb3 --- /dev/null +++ b/nixos/tests/incus/socket-activated.nix @@ -0,0 +1,25 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +{ + name = "incus-socket-activated"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + incus.enable = true; + incus.socketActivation = true; + }; + }; + + testScript = '' + machine.wait_for_unit("incus.socket") + + # ensure service is not running by default + machine.fail("systemctl is-active incus.service") + + # access the socket and ensure the service starts + machine.succeed("incus list") + machine.wait_for_unit("incus.service") + ''; +}) diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix new file mode 100644 index 000000000000..bfa116679d43 --- /dev/null +++ b/nixos/tests/incus/virtual-machine.nix @@ -0,0 +1,55 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: + +let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + + # Our tests require `grep` & friends: + environment.systemPackages = with pkgs; [busybox]; + }; + }; + + vm-image-metadata = releases.lxdVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system}; + vm-image-disk = releases.lxdVirtualMachineImage.${pkgs.stdenv.hostPlatform.system}; + + instance-name = "instance1"; +in +{ + name = "incus-virtual-machine"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = {...}: { + virtualisation = { + # Ensure test VM has enough resources for creating and managing guests + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus.enable = true; + }; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + machine.wait_for_unit("incus.service") + + machine.succeed("incus admin init --minimal") + + with subtest("virtual-machine image can be imported"): + machine.succeed("incus image import ${vm-image-metadata}/*/*.tar.xz ${vm-image-disk}/nixos.qcow2 --alias nixos") + + with subtest("virtual-machine can be launched and become available"): + machine.succeed("incus launch nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + + with subtest("lxd-agent is started"): + machine.succeed("incus exec ${instance-name} systemctl is-active lxd-agent") + ''; +}) diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index c7b7b97e9792..e0ce26609124 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -39,9 +39,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "dev" "out" ]; passthru = { - tests = { - inherit incus; - }; + inherit (incus) tests; updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 051527357ca6..4c256481bfc3 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -11,6 +11,7 @@ , udev , installShellFiles , nix-update-script +, nixosTests }: buildGoModule rec { @@ -79,6 +80,8 @@ buildGoModule rec { ''; passthru = { + tests.incus = nixosTests.incus; + updateScript = nix-update-script { extraArgs = [ "-vr" "incus-\(.*\)" diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 1eda9cf3ea72..e02876407a7b 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -24,6 +24,7 @@ , rsync , spice-gtk , squashfsTools +, util-linux , virtiofsd , xz }: @@ -44,6 +45,7 @@ let qemu-utils rsync squashfsTools + util-linux virtiofsd xz diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index 821abd91727c..a377f966241d 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -41,9 +41,12 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - passthru.tests = { - inherit incus; - updateScript = gitUpdater { }; + passthru = { + inherit (incus) tests; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { From 3087595a6bead1d30cab95a886ef0eba99fa5dae Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 27 Oct 2023 18:05:58 -0400 Subject: [PATCH 097/206] nixos/incus: preseed should not trigger socket-activation --- nixos/modules/virtualisation/incus.nix | 9 ++++++--- nixos/tests/incus/preseed.nix | 7 +------ nixos/tests/incus/socket-activated.nix | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index d7ccc963f6a6..7bf1f67eb3c6 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -194,9 +194,11 @@ in systemd.services.incus-preseed = lib.mkIf (cfg.preseed != null) { description = "Incus initialization with preseed file"; - wantedBy = [ "multi-user.target" ]; - requires = [ "incus.service" ]; - after = [ "incus.service" ]; + + wantedBy = ["incus.service"]; + after = ["incus.service"]; + bindsTo = ["incus.service"]; + partOf = ["incus.service"]; script = '' ${cfg.package}/bin/incus admin init --preseed <${ @@ -206,6 +208,7 @@ in serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; }; }; diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix index 19ec3889093c..47b2d0cd6228 100644 --- a/nixos/tests/incus/preseed.nix +++ b/nixos/tests/incus/preseed.nix @@ -49,13 +49,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : }; testScript = '' - def wait_for_preseed(_) -> bool: - _, output = machine.systemctl("is-active incus-preseed.service") - return ("inactive" in output) - machine.wait_for_unit("incus.service") - with machine.nested("Waiting for preseed to complete"): - retry(wait_for_preseed) + machine.wait_for_unit("incus-preseed.service") with subtest("Verify preseed resources created"): machine.succeed("incus profile show nixostest_default") diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix index e48831cd3cb3..4d25b26a15f5 100644 --- a/nixos/tests/incus/socket-activated.nix +++ b/nixos/tests/incus/socket-activated.nix @@ -17,6 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : # ensure service is not running by default machine.fail("systemctl is-active incus.service") + machine.fail("systemctl is-active incus-preseed.service") # access the socket and ensure the service starts machine.succeed("incus list") From 3132ba6cdaf663f51e2dce3b67d9d6c83fd6f729 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 31 Oct 2023 08:34:57 -0400 Subject: [PATCH 098/206] nixos/incus: shutdown instances on service stop --- nixos/modules/virtualisation/incus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 7bf1f67eb3c6..3a4f0d7157a0 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -166,6 +166,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; + ExecStop = "${cfg.package}/bin/incus admin shutdown"; KillMode = "process"; # when stopping, leave the containers alone Delegate = "yes"; From 5815fcf9c2a3ed81d15ae6e530c2939ddcba06e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Nov 2023 14:33:57 -0700 Subject: [PATCH 099/206] python311Packages.jarowinkler: 1.2.3 -> 2.0.1 Diff: https://github.com/maxbachmann/JaroWinkler/compare/refs/tags/v1.2.3...v2.0.1 Changelog: https://github.com/maxbachmann/JaroWinkler/blob/refs/tags/v2.0.1/CHANGELOG.md --- .../python-modules/jarowinkler/default.nix | 41 ++++--------------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 7265505fe13b..a0196265b845 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -2,60 +2,35 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cmake -, ninja -, cython -, rapidfuzz-capi -, scikit-build , setuptools -, wheel -, jarowinkler-cpp +, rapidfuzz , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.2.3"; - format = "pyproject"; + version = "2.0.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "refs/tags/v${version}"; - hash = "sha256-j+ZabVsiVitNkTPhGjDg72XogjvPaL453lTW45ITm90="; + hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo="; }; - # We cannot use Cython version 3.0.0 because the code in jarowinkler has not - # been adapted for https://github.com/cython/cython/issues/4280 yet - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'scikit-build==' 'scikit-build>=' \ - --replace 'Cython==3.0.0a11' 'Cython' - ''; - nativeBuildInputs = [ - cmake - cython - ninja - rapidfuzz-capi - scikit-build setuptools - wheel ]; - buildInputs = [ - jarowinkler-cpp + propagatedBuildInputs = [ + rapidfuzz ]; - preBuild = '' - export JAROWINKLER_BUILD_EXTENSION=1 - ''; - - dontUseCmakeConfigure = true; - nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2293e7c1643b..882922ce2db3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5568,9 +5568,7 @@ self: super: with self; { jaraco-text = callPackage ../development/python-modules/jaraco-text { }; - jarowinkler = callPackage ../development/python-modules/jarowinkler { - inherit (pkgs) cmake ninja; - }; + jarowinkler = callPackage ../development/python-modules/jarowinkler { }; javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; From 99575d3ea00a70717d451131790a889326d8fb70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Nov 2023 01:21:38 +0100 Subject: [PATCH 100/206] python311Packages.django_5: 5.0a1 -> 5.0b1 --- pkgs/development/python-modules/django/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index f17a961db655..0ea8de9a4c7c 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "5.0a1"; + version = "5.0b1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-OlIFL7xeAfIgLAIKgkGqQNwDCxbI+0ncSAzEarhzUVg="; + hash = "sha256-yIY15zPwoO9GwhljXiHI9ZeOsqFMORgiRlRUG8XVcDA="; }; patches = [ From 38cc0ce48538872355f41e7e61b47483974c1528 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 3 Nov 2023 01:44:38 +0100 Subject: [PATCH 101/206] jemalloc: disable tests for pkgsStatic (#265093) --- pkgs/development/libraries/jemalloc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index b4625abcd692..8a3b8658fbb8 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; - doCheck = true; + # Tries to link test binaries binaries dynamically and fails + doCheck = !stdenv.hostPlatform.isStatic; enableParallelBuilding = true; From 2b99bc39c395c1159d7483ccdc6cd54914fddbf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 00:45:10 +0000 Subject: [PATCH 102/206] open-pdf-sign: 0.1.6 -> 0.1.7 --- pkgs/tools/misc/open-pdf-sign/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 1a8b647933a0..4a70bc2131dd 100644 --- a/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.1.6"; + version = "0.1.7"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar"; - hash = "sha256-GpMDgN4P8neHOQsXtg2AKXNeCMnv3nEHH50ZVU0uVvY="; + hash = "sha256-pUIE2pTa+5Rt8PNYtfbtqoX0dxdS6lViqdqjJU5feoo="; }; nativeBuildInputs = [ From 1e6c9697ebaa7da32a0f4b8b915442cc739097be Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 2 Nov 2023 20:45:14 -0400 Subject: [PATCH 103/206] telegram-desktop: 4.11.2 -> 4.11.3 (#265068) Diff: https://github.com/telegramdesktop/tdesktop/compare/v4.11.2...v4.11.3 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v4.11.3 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index cf4e367dd8f0..3687379f8b4f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -104,14 +104,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.11.2"; + version = "4.11.3"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Hjg349h9dlBfKVLIPDqPP8U+Yt0Iaeyjq6hsUB5+zYM="; + hash = "sha256-Xjb8um3TA2yIPrCdEV1BJ10keyAqTnlU20ZZ0T3P3ls="; }; patches = [ From be03e203062784d0368cfd2a635d61a50bd8cdc0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 2 Nov 2023 20:48:07 -0400 Subject: [PATCH 104/206] cargo-release: 0.24.12 -> 0.25.0 (#265028) Diff: https://github.com/crate-ci/cargo-release/compare/refs/tags/v0.24.12...v0.25.0 Changelog: https://github.com/crate-ci/cargo-release/blob/v0.25.0/CHANGELOG.md --- .../tools/rust/cargo-release/Cargo.lock | 789 +++++++++++++++--- .../tools/rust/cargo-release/default.nix | 6 +- 2 files changed, 697 insertions(+), 98 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock index 0e4455addfb7..6e75ae6d73c4 100644 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-release/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -19,9 +28,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -57,9 +66,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -86,6 +95,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "async-compression" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "atty" version = "0.2.14" @@ -103,12 +125,33 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + [[package]] name = "base64ct" version = "1.6.0" @@ -121,6 +164,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "block-buffer" version = "0.10.4" @@ -132,9 +181,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "regex-automata", @@ -147,6 +196,12 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + [[package]] name = "camino" version = "1.1.4" @@ -167,7 +222,7 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.24.12" +version = "0.25.0" dependencies = [ "anyhow", "assert_fs", @@ -178,7 +233,6 @@ dependencies = [ "clap", "clap-cargo", "concolor-control", - "crates-index", "difflib", "dirs-next", "dunce", @@ -188,20 +242,22 @@ dependencies = [ "globset", "ignore", "indexmap 1.9.3", - "itertools", + "itertools 0.11.0", "log", "maplit", "once_cell", "predicates", "quick-error", "regex", + "reqwest", "semver", "serde", "snapbox", + "tame-index", "termcolor", "time", - "toml", - "toml_edit", + "toml 0.8.6", + "toml_edit 0.20.7", "trycmd", ] @@ -223,7 +279,7 @@ dependencies = [ "flate2", "git2", "glob", - "itertools", + "itertools 0.10.5", "lazy_static", "pasetors", "serde", @@ -232,7 +288,7 @@ dependencies = [ "tar", "termcolor", "time", - "toml", + "toml 0.7.6", "url", "windows-sys 0.48.0", ] @@ -260,9 +316,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ "camino", "cargo-platform", @@ -274,11 +330,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -289,9 +346,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -299,9 +356,9 @@ dependencies = [ [[package]] name = "clap-cargo" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" +checksum = "38ae55615695e768a76899c8411b4ebacfbe525e964f94fd24f0007b10b45cd3" dependencies = [ "anstyle", "cargo_metadata", @@ -310,9 +367,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -323,9 +380,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -335,9 +392,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -352,7 +409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "concolor-query", ] @@ -402,27 +459,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crates-index" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65aa5fcd68f892b56202f15a18a53308b2d489b728958dbce48d2d1f3bbaa685" -dependencies = [ - "git2", - "hex", - "home", - "memchr", - "num_cpus", - "rayon", - "rustc-hash", - "semver", - "serde", - "serde_derive", - "serde_json", - "smol_str", - "toml", -] - [[package]] name = "crates-io" version = "0.36.1" @@ -527,7 +563,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.9", "winapi", ] @@ -658,6 +694,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -770,6 +815,54 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-core", + "futures-io", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -783,9 +876,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -794,6 +887,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "git-conventional" version = "0.12.4" @@ -811,7 +910,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -845,7 +944,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -861,6 +960,25 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -908,9 +1026,6 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] [[package]] name = "hkdf" @@ -939,6 +1054,40 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + [[package]] name = "humantime" version = "2.1.0" @@ -955,6 +1104,44 @@ dependencies = [ "serde", ] +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "idna" version = "0.3.0" @@ -1022,6 +1209,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + [[package]] name = "is-terminal" version = "0.4.7" @@ -1030,7 +1223,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -1043,6 +1236,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" @@ -1075,9 +1277,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libgit2-sys" @@ -1125,6 +1327,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" + [[package]] name = "log" version = "0.4.18" @@ -1152,6 +1360,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1161,6 +1375,17 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + [[package]] name = "miow" version = "0.5.0" @@ -1195,6 +1420,15 @@ dependencies = [ "libc", ] +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1298,6 +1532,18 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkcs8" version = "0.10.2" @@ -1323,7 +1569,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1356,9 +1602,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1415,7 +1661,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1424,7 +1670,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1440,9 +1686,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1452,9 +1698,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1463,9 +1709,51 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "async-compression", + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] [[package]] name = "rfc6979" @@ -1478,10 +1766,24 @@ dependencies = [ ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "ring" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" @@ -1489,14 +1791,58 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.13" @@ -1527,6 +1873,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sec1" version = "0.7.2" @@ -1583,13 +1939,25 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.10.6" @@ -1629,6 +1997,15 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + [[package]] name = "smol_str" version = "0.2.0" @@ -1640,9 +2017,9 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" +checksum = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" dependencies = [ "anstream", "anstyle", @@ -1662,9 +2039,9 @@ dependencies = [ [[package]] name = "snapbox-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" +checksum = "ed1559baff8a696add3322b9be3e940d433e7bb4e38d79017205fd37ff28b28e" dependencies = [ "anstream", ] @@ -1679,6 +2056,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.2" @@ -1689,6 +2082,12 @@ dependencies = [ "der", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.10.0" @@ -1712,6 +2111,47 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tame-index" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239b73acdc37c857aae3832bdc739b937b038e5e8b148191a79545a2beb5af74" +dependencies = [ + "camino", + "home", + "http", + "memchr", + "reqwest", + "semver", + "serde", + "serde_json", + "smol_str", + "thiserror", + "toml 0.7.6", + "twox-hash", +] + [[package]] name = "tar" version = "0.4.38" @@ -1731,26 +2171,26 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.19", "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix", + "rustix 0.38.15", "windows-sys 0.48.0", ] @@ -1832,6 +2272,46 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.4", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.7.6" @@ -1841,14 +2321,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -1867,10 +2359,54 @@ dependencies = [ ] [[package]] -name = "trycmd" -version = "0.14.17" +name = "toml_edit" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "trycmd" +version = "0.14.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed009372a42fb103e6f8767b9222925485e03cca032b700d203e2c5b67bee4fb" dependencies = [ "glob", "humantime", @@ -1879,7 +2415,17 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit", + "toml_edit 0.20.7", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", ] [[package]] @@ -1918,6 +2464,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.3.1" @@ -1966,6 +2518,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1997,6 +2558,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.86" @@ -2026,6 +2599,22 @@ version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +[[package]] +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -2213,6 +2802,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "zeroize" version = "1.6.0" diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index af3513842376..8e9c84797d94 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.12"; + version = "0.25.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-dB5gpaY6OB/IjMvqLUMH41l6Q/xMookxfVGXRcdhcBM="; + hash = "sha256-UJdGbuQfvlZHjCKyHCXPDJ5AdUWJCRUS/vNeTKAwyYI="; }; cargoLock = { @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ curl - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ From 4a7344c3aaa579923e7649f3b3eb41eeff66723a Mon Sep 17 00:00:00 2001 From: kilianar <105428155+kilianar@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:49:05 +0100 Subject: [PATCH 105/206] hugo: 0.120.2 -> 0.120.3 (#265027) https://github.com/gohugoio/hugo/releases/tag/v0.120.3 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 8ee00acc7536..ef9be284b59d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.120.2"; + version = "0.120.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hCcutRfx0GtnYJYoQ/2S8Y+OmxLCtHWzTCdozWUatXY="; + hash = "sha256-96ikGGKw9IN/ch199oFcucp8aVR+fEiAWBeu39J2Osw="; }; - vendorHash = "sha256-59Q7IN7VK7tQv5w7qyxSz16G+Kmsrslu8we9S3aJeAg="; + vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; doCheck = false; From 4f3186b458189cf7095726792e8f183ea96e1a47 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Nov 2023 00:52:10 +0000 Subject: [PATCH 106/206] postfix: 3.8.2 -> 3.8.3 (#265022) Changes: https://www.postfix.org/announcements/postfix-3.8.3.html --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index e9dea5282aa9..002ea06ef905 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-Z5CQPNu14ORxlmkeuaXyz4BQJi3vlB4Dnm1L9AQ6XjA="; + hash = "sha256-FpRsmHSnhqCfU7F9HIPcH6rjXL+AurNKsBeYtwQglos="; }; nativeBuildInputs = [ makeWrapper m4 ]; From bd26885bbdfb180fe0dac112386e410f709784e1 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:24:12 -0700 Subject: [PATCH 107/206] m2libc: init at unstable-2023-05-22 --- pkgs/by-name/m2/m2libc/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/m2/m2libc/package.nix diff --git a/pkgs/by-name/m2/m2libc/package.nix b/pkgs/by-name/m2/m2libc/package.nix new file mode 100644 index 000000000000..6c7b695ef715 --- /dev/null +++ b/pkgs/by-name/m2/m2libc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2libc"; + version = "unstable-2023-05-22"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2libc"; + rev = "de7c75f144176c3b9be77695d9bf94440445aeae"; + hash = "sha256-248plvODhBRfmx7zOmf05ICbk8vzSbaceZJ0j+wPaAY="; + }; + + patches = [ + # # aarch64: syscall: mkdir -> mkdirat + # https://github.com/oriansj/M2libc/pull/17 + (fetchpatch { + url = "https://github.com/oriansj/M2libc/commit/ff7c3023b3ab6cfcffc5364620b25f8d0279e96b.patch"; + hash = "sha256-QAKddv4TixIQHpFa9SVu9fAkeKbzhQaxjaWzW2yJy7A="; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -r . $out/include/M2libc + + runHook postInstall + ''; + + meta = with lib; { + description = "More standards compliant C library written in M2-Planet's C subset"; + homepage = "https://github.com/oriansj/m2libc"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "riscv32-linux" "riscv64-linux" ]; + }; +}) From f1a2feaa969f830ebfaf66ec598451aff6ad1bd9 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:24:39 -0700 Subject: [PATCH 108/206] mescc-tools: init at 1.5.1 --- pkgs/by-name/me/mescc-tools/package.nix | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/me/mescc-tools/package.nix diff --git a/pkgs/by-name/me/mescc-tools/package.nix b/pkgs/by-name/me/mescc-tools/package.nix new file mode 100644 index 000000000000..635e375aa80b --- /dev/null +++ b/pkgs/by-name/me/mescc-tools/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromSavannah +, m2libc +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools"; + version = "1.5.1"; + + src = fetchFromSavannah { + repo = "mescc-tools"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-jFDrmzsjKEQKOKlsch1ceWtzUhoJAJVyHjXGVhjE9/U="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ which ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://savannah.nongnu.org/projects/mescc-tools"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) From 7db10104532e92a1513dcdfb5cf025593a5f78f3 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 14 Jul 2023 16:17:24 +0800 Subject: [PATCH 109/206] erofs-utils: add selinuxSupport option --- pkgs/tools/filesystems/erofs-utils/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index dbf8de967d73..b57dcc4b3629 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib, libselinux , fuseSupport ? stdenv.isLinux +, selinuxSupport ? false }: stdenv.mkDerivation rec { @@ -15,11 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ util-linux lz4 zlib ] - ++ lib.optionals fuseSupport [ fuse ]; + ++ lib.optionals fuseSupport [ fuse ] + ++ lib.optionals selinuxSupport [ libselinux ]; configureFlags = [ "MAX_BLOCK_SIZE=4096" - ] ++ lib.optional fuseSupport "--enable-fuse"; + ] ++ lib.optional fuseSupport "--enable-fuse" + ++ lib.optional selinuxSupport "--with-selinux"; meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; From dfa6dfc5fbfa912e427905a0936aff3336dd9061 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:25:14 -0700 Subject: [PATCH 110/206] mescc-tools-extra: init at 1.3.0 --- pkgs/by-name/me/mescc-tools-extra/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/me/mescc-tools-extra/package.nix diff --git a/pkgs/by-name/me/mescc-tools-extra/package.nix b/pkgs/by-name/me/mescc-tools-extra/package.nix new file mode 100644 index 000000000000..892c185060e1 --- /dev/null +++ b/pkgs/by-name/me/mescc-tools-extra/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, perl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools-extra"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "mescc-tools-extra"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-LS9Eq1z+OsDF7Jq0TfF4u8jEJ5bjcLZNfKtnpIbtG20="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ perl ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://github.com/oriansj/mescc-tools-extra"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) From 93db87d3af9c420910a0e5b452ed9ab4f7632ecb Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:25:48 -0700 Subject: [PATCH 111/206] m2-planet: init at 1.11.0 --- pkgs/by-name/m2/m2-planet/package.nix | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/m2/m2-planet/package.nix diff --git a/pkgs/by-name/m2/m2-planet/package.nix b/pkgs/by-name/m2/m2-planet/package.nix new file mode 100644 index 000000000000..926d829ba691 --- /dev/null +++ b/pkgs/by-name/m2/m2-planet/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-planet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Planet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-xVwUO67PlRiBj/YBnnTXFGh3jH470fcbaNjABoyYes4="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Planet $out/bin/M2-Planet + + runHook postInstall + ''; + + meta = with lib; { + description = "PLAtform NEutral Transpiler"; + homepage = "https://github.com/oriansj/M2-Planet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Planet"; + }; +}) From cde691ddc26a5380e33c0f67bf92fc79c366f5d2 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:26:20 -0700 Subject: [PATCH 112/206] m2-mesoplanet: init at 1.11.0 --- pkgs/by-name/m2/m2-mesoplanet/package.nix | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/m2/m2-mesoplanet/package.nix diff --git a/pkgs/by-name/m2/m2-mesoplanet/package.nix b/pkgs/by-name/m2/m2-mesoplanet/package.nix new file mode 100644 index 000000000000..d4f7419f91f4 --- /dev/null +++ b/pkgs/by-name/m2/m2-mesoplanet/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, mescc-tools +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-mesoplanet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Mesoplanet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-hE7xvX84q3tk0XakveYDJhrhfBnpoItQs456NCzFfws="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ mescc-tools ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Mesoplanet $out/bin/M2-Mesoplanet + + runHook postInstall + ''; + + meta = with lib; { + description = "Macro Expander Saving Our m2-PLANET"; + homepage = "https://github.com/oriansj/M2-Mesoplanet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Mesoplanet"; + }; +}) From 0025a888ba92f63670596d5084a91b2067c50618 Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Fri, 3 Nov 2023 02:34:19 +0100 Subject: [PATCH 113/206] linuxKernel.kernels.linux_lqx: 6.5.9-lqx2 -> 6.5.10-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 6fe869e86c5c..5b418b6a7cc6 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.9"; #lqx - suffix = "lqx2"; #lqx - sha256 = "12l6z4bgrx5pf4fpcqsnzascr7f43cg1vwpayhgcwd7zimlbz1mg"; #lqx + version = "6.5.10"; #lqx + suffix = "lqx1"; #lqx + sha256 = "10bny5x2a3brfamyajvnl75h7s64vvmymgnvwgaq82q4bmsfcdd1"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From f12af77bd8af86a2b2709dc9c14256e1a2c3aca1 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 2 Nov 2023 22:09:37 -0400 Subject: [PATCH 114/206] nixos/tests/incus: improve test resiliency under load --- nixos/tests/incus/container.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index ce9a8a10fb25..79b9e2fbabdc 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -29,8 +29,14 @@ in testScript = '' def instance_is_up(_) -> bool: - status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") - return status == 0 + status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + def set_container(config): + machine.succeed(f"incus config set container {config}") + machine.succeed("incus restart container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) machine.wait_for_unit("incus.service") @@ -49,28 +55,23 @@ in machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -") with subtest("Container CPU limits can be managed"): - machine.succeed("incus config set container limits.cpu 1") - # give container a chance to apply new resource limit - machine.sleep(1) + set_container("limits.cpu 1") cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" - machine.succeed("incus config set container limits.cpu 2") - machine.sleep(1) + set_container("limits.cpu 2") cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" with subtest("Container memory limits can be managed"): - machine.succeed("incus config set container limits.memory 64MB") - machine.sleep(1) + set_container("limits.memory 64MB") meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" - machine.succeed("incus config set container limits.memory 128MB") - machine.sleep(1) + set_container("limits.memory 128MB") meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) - assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" ''; }) From 7ed97be3629ad65d0ffe7f47d46df84eac220644 Mon Sep 17 00:00:00 2001 From: IogaMaster Date: Thu, 2 Nov 2023 17:09:43 -0600 Subject: [PATCH 115/206] picom-allusive: 0.3.2 -> 1.2.5 Co-authored-by: Allusive <99632976+allusive-dev@users.noreply.github.com> --- pkgs/applications/window-managers/picom/picom-allusive.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix index eb31dd9ccdff..0efb67f641bb 100644 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ b/pkgs/applications/window-managers/picom/picom-allusive.nix @@ -2,19 +2,18 @@ picom.overrideAttrs (oldAttrs: rec { pname = "picom-allusive"; - version = "0.3.2"; + version = "1.2.5"; src = fetchFromGitHub { owner = "allusive-dev"; repo = "picom-allusive"; rev = version; - hash = "sha256-1zWntz2QKp/O9ZuOUZy9NkCNXFsBqRRvcd0SAr+7G/o="; + hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; }; nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs; postInstall = '' - chmod +x $out/bin/picom-trans installManPage $src/man/picom.1.gz '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); @@ -22,6 +21,6 @@ picom.overrideAttrs (oldAttrs: rec { description = "A fork of picom featuring improved animations and other features"; homepage = "https://github.com/allusive-dev/picom-allusive"; license = with lib.licenses; [ mit mpl20 ]; - maintainers = with lib.maintainers; [ allusive ]; + maintainers = with lib.maintainers; [ allusive iogamaster ]; }; }) From 85211e8b1dab51c437103682893f4cba3a9c4502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 02:43:38 +0000 Subject: [PATCH 116/206] openvi: 7.4.24 -> 7.4.26 --- pkgs/applications/editors/openvi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix index 83abef98152b..54a57d949eff 100644 --- a/pkgs/applications/editors/openvi/default.nix +++ b/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.4.24"; + version = "7.4.26"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-jfh82Ti8iVqsh7G9BnHbc3cQP8D9dGV71YJ28SBjjgA="; + hash = "sha256-Fgsw4ovq7PXqPF5ECVFJulrcHdsbRQsvy62DAr4RRr4="; }; buildInputs = [ ncurses perl ]; From 2438d480cb8bc0a21bd6657ed1fe4a61be061696 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 02:51:44 +0000 Subject: [PATCH 117/206] orchard: 0.14.1 -> 0.14.3 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index a0aa38665352..04443e2f1698 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-u4aGjEkQ9H7caW2Y5ZbiGhCV47I0Afi5NC/apJB5qvU="; + hash = "sha256-hQP48druIwkVVKeC1TKq+DEGOJOmkendc3Ij9ft+uDQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-BrzS+QtpGUHcYNNmSI6FlBtcYwNFri7R6nlVvFihdb4="; + vendorHash = "sha256-opPxsCukXcLcrf/sD9AW1iIYOK5BmTLnc/QGUvzVLwg="; nativeBuildInputs = [ installShellFiles ]; From f95962625a48ddb8540679325372752bf30ecd88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 03:26:01 +0000 Subject: [PATCH 118/206] osv-scanner: 1.4.1 -> 1.4.3 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index be8fbb2489f6..c250ed1021db 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-xc9qdzdJYg12twjLAGw1GEkfkFsk8UBgzSyOSg/FB20="; + hash = "sha256-PLLpWr1cc+JY2N1PwlKmHw5J3F7txM4uXcu/vjGhp8o="; }; - vendorHash = "sha256-e1XG3DZGDBKKcEpMBi0vqKo3f9TnXdFKOUzZ7KZhPAw="; + vendorHash = "sha256-fQQW52xog1L31wSIlnyHPyO1nEpjqrn+PtO2B9CWZH0="; subPackages = [ "cmd/osv-scanner" From bb1e6d94a26e6ea74d9b75eb0ca4a616964c1432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 03:26:28 +0000 Subject: [PATCH 119/206] otel-cli: 0.4.0 -> 0.4.1 --- pkgs/tools/misc/otel-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index 9a2aca663972..635e8ee10185 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "otel-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-xIvxjmrZd/2eT2JAagH+mMyYkDjc7La5dUqsmNnOtrc="; + hash = "sha256-kOTReHG7byOqKsaVrXXNq9DAyawTz4hUeR4Q5lJKmiM="; }; - vendorHash = "sha256-mnMtvR2r5HbKC0P5iGFkwLcpx3IvmhgCI8/CCVJunXw="; + vendorHash = "sha256-HwbEqWtOqiTe5Z/MtMAs63Lzvll/vgmbCpMTREXgtXA="; preCheck = '' ln -s $GOPATH/bin/otel-cli . From 6583bd180ce559068bd10e6ea4d591c4856e3344 Mon Sep 17 00:00:00 2001 From: Viktor Nordling Date: Mon, 30 Oct 2023 10:41:24 +1100 Subject: [PATCH 120/206] python311Packages.prometheus-pandas: init at 0.3.2 --- .../prometheus-pandas/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/prometheus-pandas/default.nix diff --git a/pkgs/development/python-modules/prometheus-pandas/default.nix b/pkgs/development/python-modules/prometheus-pandas/default.nix new file mode 100644 index 000000000000..da6e9c1bccdd --- /dev/null +++ b/pkgs/development/python-modules/prometheus-pandas/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, numpy +, pandas +}: + +buildPythonPackage rec { + pname = "prometheus-pandas"; + version = "0.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zysdlYPjvhextAfW4vvGN6mSPVUbWLV+AvQ1hGWCAbw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + pandas + ]; + + # There are no tests. :( + doCheck = false; + + pythonImportsCheck = [ + "prometheus_pandas" + ]; + + meta = with lib; { + homepage = "https://github.com/dcoles/prometheus-pandas"; + license = licenses.mit; + description = "Pandas integration for Prometheus"; + maintainers = with maintainers; [ viktornordling ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0020c04143aa..81700cf27e0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9103,6 +9103,8 @@ self: super: with self; { prodict = callPackage ../development/python-modules/prodict { }; + prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { }; + prophet = callPackage ../development/python-modules/prophet { }; propka = callPackage ../development/python-modules/propka { }; From 2ef6636cc99420fcc20fa21d5f1ad567537df9f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 08:11:33 +0000 Subject: [PATCH 121/206] initool: 0.13.0 -> 0.14.0 --- pkgs/development/tools/initool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix index d13158feb55f..76ab9f805abe 100644 --- a/pkgs/development/tools/initool/default.nix +++ b/pkgs/development/tools/initool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "initool"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256-99dkog0fr+IrMyrEBDf21tSGGREgAoHcU2+MJdGIvCM="; + hash = "sha256-qi8K3O6K9ZIKFlNFJ3O9/iKE+8M/mf/8V8qgl1BOaKo="; }; nativeBuildInputs = [ mlton ]; From d7abb3a970302200f7a57075d64f837d855bdeba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 21:56:44 +0000 Subject: [PATCH 122/206] linkerd_edge: 23.10.1 -> 23.10.4 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9cbef432e682..8fdbdc3a3e27 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.10.1"; - sha256 = "1m4inwim5iyahwza3i4zwz4iaja9p93vfacq324r9w8gciyvc26s"; - vendorHash = "sha256-wjICOdn/YqRmWHZQYB/WS0fxJ+OQsnas6BphUC2C9go="; + version = "23.10.4"; + sha256 = "1fbzxkfc957kdhk60x3ywwpn54zq8njqk313cgfygnrmmj3m67j9"; + vendorHash = "sha256-WEnopX/tIRoA5wiiCMue1T3wottxv744Mp7XJl63j4k="; } From 1dfb3f52638ec76706f82acf32e4fecab669e167 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 3 Nov 2023 09:32:06 +0530 Subject: [PATCH 123/206] tailscale: 1.52.0 -> 1.52.1 Diff: https://github.com/tailscale/tailscale/compare/v1.52.0...v1.52.1 Signed-off-by: Muhammad Falak R Wani --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 35335e5e5879..b07a715f6736 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.52.0"; + version = "1.52.1"; in buildGoModule { pname = "tailscale"; @@ -11,7 +11,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-mvsDM1kOLP/1LbTzmojquEF8HGy6Kb2cqJu7EnxEHPU="; + hash = "sha256-hscKV4jhJ+tqgTFuOEThABpu8iqK3+av7+DcuSmZwQ4="; }; vendorHash = "sha256-WGZkpffwe4I8FewdBHXGaLbKQP/kHr7UF2lCXBTcNb4="; From 09499a0580dbb9ad21ba9feaa4a70c357806fd3f Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Wed, 1 Nov 2023 23:34:55 -0300 Subject: [PATCH 124/206] dotbot: init at 1.20.1 --- pkgs/by-name/do/dotbot/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/do/dotbot/package.nix diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix new file mode 100644 index 000000000000..a2b979f67139 --- /dev/null +++ b/pkgs/by-name/do/dotbot/package.nix @@ -0,0 +1,43 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "dotbot"; + version = "1.20.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anishathalye"; + repo = "dotbot"; + rev = "v${version}"; + hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE="; + }; + + preCheck = '' + patchShebangs bin/dotbot + ''; + + nativeBuildInputs = with python3Packages; [ setuptools ]; + + propagatedBuildInputs = with python3Packages; [ pyyaml ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + meta = with lib; { + description = "A tool that bootstraps your dotfiles"; + longDescription = '' + Dotbot is designed to be lightweight and self-contained, with no external + dependencies and no installation required. Dotbot can also be a drop-in + replacement for any other tool you were using to manage your dotfiles, and + Dotbot is VCS-agnostic -- it doesn't make any attempt to manage your + dotfiles. + ''; + homepage = "https://github.com/anishathalye/dotbot"; + changelog = + "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ludat ]; + }; +} From 297a971a16ad5998b5c4d2e3361413e9358f1d2d Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Fri, 3 Nov 2023 04:29:09 +0000 Subject: [PATCH 125/206] tests.cross.sanity: add pkgs.pkgsMusl.pkgsCross.gnu64.hello (#262876) --- pkgs/test/cross/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 8daa03c56222..b13c41a19053 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -145,6 +145,12 @@ let pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv + + ] ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [ + # Musl-to-glibc cross on the same architecture tends to turn up + # lots of interesting corner cases. Only expected to work for + # x86_64-linux buildPlatform. + pkgs.pkgsMusl.pkgsCross.gnu64.hello ]; in { From 82d31934b2cf72a4cdefa2f4687d2b6b1cd77c86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 04:47:33 +0000 Subject: [PATCH 126/206] pfetch-rs: 2.7.0 -> 2.8.1 --- pkgs/tools/misc/pfetch-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 4ceed388cd4b..6291d24e2336 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-KNd6EKYxuSNvWXNERZ+ZGq3HzRbE75LZPcAlfB4Aoyw="; + hash = "sha256-/eVtI+Uvb0r1af20MlQU8sDSNf6YyIBvFKSVp47JMfQ="; }; - cargoHash = "sha256-Zxtf1OPsafm/BexDsHKb4Ei/ca3Nxz7c/U/A0AnAAI4="; + cargoHash = "sha256-eEBtrMF6dl5TzOZHnqjX4Yz2SfknGM2bzJcQWQIctPc="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 08cf9e559bb6209f2851fe7027cfcd7205a6d38b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:01:06 +0000 Subject: [PATCH 127/206] php81Extensions.amqp: 1.11.0 -> 2.1.1 --- pkgs/development/php-packages/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix index bc955553119b..5153c500f2ba 100644 --- a/pkgs/development/php-packages/amqp/default.nix +++ b/pkgs/development/php-packages/amqp/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, rabbitmq-c, fetchFromGitHub }: let - version = "1.11.0"; + version = "2.1.1"; in buildPecl { inherit version; pname = "amqp"; @@ -10,7 +10,7 @@ in buildPecl { owner = "php-amqp"; repo = "php-amqp"; rev = "v${version}"; - sha256 = "sha256-CDhNDk78D15MtljbtyYj8euPnCruLZnc2NEHqXDX8HY="; + sha256 = "sha256-QHiQL3INd0zQpmCOcJx7HhN770m9ql0Cs63OTOLOrNQ="; }; buildInputs = [ rabbitmq-c ]; From 6177ec01d3dbea4a9fdfad37274af57f25f42e79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:16:06 +0000 Subject: [PATCH 128/206] php81Extensions.datadog_trace: 0.92.2 -> 0.93.1 --- .../php-packages/datadog_trace/Cargo.lock | 433 +++++++++--------- .../php-packages/datadog_trace/default.nix | 6 +- 2 files changed, 216 insertions(+), 223 deletions(-) diff --git a/pkgs/development/php-packages/datadog_trace/Cargo.lock b/pkgs/development/php-packages/datadog_trace/Cargo.lock index 7eb8515e4049..b2633f3a06c1 100644 --- a/pkgs/development/php-packages/datadog_trace/Cargo.lock +++ b/pkgs/development/php-packages/datadog_trace/Cargo.lock @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -67,7 +67,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -78,9 +78,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" @@ -108,7 +108,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -118,7 +118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", - "libc 0.2.147", + "libc 0.2.149", "winapi", ] @@ -182,7 +182,7 @@ dependencies = [ "addr2line", "cc", "cfg-if", - "libc 0.2.147", + "libc 0.2.149", "miniz_oxide", "object 0.32.1", "rustc-demangle", @@ -196,9 +196,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "basic-toml" @@ -231,13 +231,13 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.14", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.31", + "syn 2.0.38", "which", ] @@ -267,21 +267,21 @@ checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -317,7 +317,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -345,9 +345,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.29" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -389,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", - "libc 0.2.147", + "libc 0.2.149", "libloading", ] @@ -410,18 +410,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstyle", "clap_lex 0.5.1", @@ -501,7 +501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -516,7 +516,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "winapi", ] @@ -538,7 +538,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.2", + "clap 4.4.6", "criterion-plot", "is-terminal", "itertools", @@ -620,9 +620,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -650,7 +650,7 @@ dependencies = [ "futures", "glibc_version", "io-lifetimes", - "libc 0.2.147", + "libc 0.2.149", "memfd", "nix 0.26.4", "page_size", @@ -673,12 +673,12 @@ name = "datadog-ipc-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] name = "datadog-php-profiling" -version = "0.92.2" +version = "0.93.1" dependencies = [ "ahash 0.8.3", "anyhow", @@ -691,11 +691,11 @@ dependencies = [ "criterion-perf-events", "crossbeam-channel", "datadog-profiling", - "ddcommon 4.0.0", + "ddcommon 5.0.0", "env_logger", - "indexmap 2.0.0", + "indexmap 2.0.2", "lazy_static", - "libc 0.2.147", + "libc 0.2.149", "log", "once_cell", "ouroboros", @@ -707,14 +707,14 @@ dependencies = [ [[package]] name = "datadog-profiling" -version = "4.0.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v4.0.0#a07180585a39b0e0baeb858d20efb8d7b57f17c4" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v5.0.0#7b8a01ecfaf03e063feb16896356e71b9a2fc6f3" dependencies = [ "anyhow", "bitmaps", "bytes", "chrono", - "ddcommon 4.0.0", + "ddcommon 5.0.0", "derivative", "futures", "futures-core", @@ -724,7 +724,7 @@ dependencies = [ "hyper", "hyper-multipart-rfc7578", "indexmap 1.9.3", - "libc 0.2.147", + "libc 0.2.149", "lz4_flex", "mime", "mime_guess", @@ -734,7 +734,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", ] [[package]] @@ -758,7 +758,7 @@ dependencies = [ "hyper", "io-lifetimes", "lazy_static", - "libc 0.2.147", + "libc 0.2.149", "manual_future", "nix 0.26.4", "pin-project", @@ -773,7 +773,7 @@ dependencies = [ "sys-info", "tempfile", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-subscriber", "uuid", @@ -792,7 +792,7 @@ dependencies = [ "ddtelemetry", "ddtelemetry-ffi", "hyper", - "libc 0.2.147", + "libc 0.2.149", "paste", "tempfile", ] @@ -802,7 +802,7 @@ name = "datadog-sidecar-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -873,8 +873,8 @@ dependencies = [ [[package]] name = "ddcommon" -version = "4.0.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v4.0.0#a07180585a39b0e0baeb858d20efb8d7b57f17c4" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v5.0.0#7b8a01ecfaf03e063feb16896356e71b9a2fc6f3" dependencies = [ "anyhow", "futures", @@ -922,7 +922,7 @@ dependencies = [ "serde_json", "sys-info", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-subscriber", "uuid", @@ -935,7 +935,7 @@ dependencies = [ "ddcommon 0.0.1", "ddcommon-ffi", "ddtelemetry", - "libc 0.2.147", + "libc 0.2.149", "paste", "tempfile", ] @@ -991,9 +991,9 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1009,15 +1009,15 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -1041,30 +1041,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", - "libc 0.2.147", + "libc 0.2.149", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc 0.2.147", -] - [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fixedbitset" @@ -1150,7 +1139,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -1207,7 +1196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "libc 0.2.147", + "libc 0.2.149", "wasi", ] @@ -1247,7 +1236,7 @@ dependencies = [ "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", ] @@ -1268,9 +1257,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "hdrhistogram" @@ -1297,14 +1286,14 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", ] [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1459,12 +1448,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -1479,8 +1468,8 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", - "libc 0.2.147", + "hermit-abi 0.3.3", + "libc 0.2.149", "windows-sys", ] @@ -1490,8 +1479,8 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.11", + "hermit-abi 0.3.3", + "rustix", "windows-sys", ] @@ -1545,9 +1534,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1561,21 +1550,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -1628,23 +1611,23 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix", ] [[package]] @@ -1711,7 +1694,7 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "wasi", "windows-sys", ] @@ -1740,7 +1723,7 @@ checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc 0.2.147", + "libc 0.2.149", "memoffset 0.6.5", ] @@ -1752,7 +1735,7 @@ checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc 0.2.147", + "libc 0.2.149", "memoffset 0.7.1", "pin-utils", ] @@ -1765,7 +1748,7 @@ checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ "bitflags 2.4.0", "cfg-if", - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -1821,9 +1804,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -1835,8 +1818,8 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", - "libc 0.2.147", + "hermit-abi 0.3.3", + "libc 0.2.149", ] [[package]] @@ -1958,7 +1941,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -1973,7 +1956,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "winapi", ] @@ -1994,7 +1977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "libc 0.2.147", + "libc 0.2.149", "redox_syscall", "smallvec", "windows-targets", @@ -2025,7 +2008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ba1fd955270ca6f8bd8624ec0c4ee1a251dd3cc0cc18e1e2665ca8f5acb1501" dependencies = [ "bitflags 1.3.2", - "libc 0.2.147", + "libc 0.2.149", "mmap", "nom 4.2.3", "x86", @@ -2038,7 +2021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -2096,7 +2079,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -2151,7 +2134,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "nix 0.27.1", ] @@ -2177,12 +2160,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8832c0f9be7e3cae60727e6256cfd2cd3c3e2b6cd5dad4190ecb2fd658c9030b" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -2211,9 +2194,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2338,7 +2321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ "fuchsia-cprng", - "libc 0.2.147", + "libc 0.2.149", "rand_core 0.3.1", "rdrand", "winapi", @@ -2350,7 +2333,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "rand_chacha", "rand_core 0.6.4", ] @@ -2410,9 +2393,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2420,14 +2403,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2450,14 +2431,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.1", ] [[package]] @@ -2471,13 +2452,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.1", ] [[package]] @@ -2488,9 +2469,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "remove_dir_all" @@ -2508,21 +2489,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", - "libc 0.2.147", + "libc 0.2.149", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc 0.2.149", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "rlimit" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -2561,28 +2556,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc 0.2.147", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", - "libc 0.2.147", - "linux-raw-sys 0.4.5", + "libc 0.2.149", + "linux-raw-sys", "windows-sys", ] @@ -2593,7 +2574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -2616,7 +2597,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] @@ -2672,8 +2653,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2685,7 +2666,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-foundation-sys", - "libc 0.2.147", + "libc 0.2.149", "security-framework-sys", ] @@ -2696,7 +2677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -2705,7 +2686,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "tokio", ] @@ -2735,14 +2716,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2751,9 +2732,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2777,7 +2758,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -2797,9 +2778,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -2807,17 +2788,17 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "winapi", ] [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ - "libc 0.2.147", + "libc 0.2.149", "windows-sys", ] @@ -2840,6 +2821,12 @@ 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 = "static_assertions" version = "1.1.0" @@ -2865,9 +2852,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2887,7 +2874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" dependencies = [ "cc", - "libc 0.2.147", + "libc 0.2.149", ] [[package]] @@ -2915,7 +2902,7 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -2954,15 +2941,15 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix 0.38.11", + "rustix", "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2975,22 +2962,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -3037,19 +3024,19 @@ dependencies = [ [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", - "libc 0.2.147", + "libc 0.2.149", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "tracing", "windows-sys", @@ -3073,7 +3060,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -3130,9 +3117,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -3160,7 +3147,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.3", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -3194,7 +3181,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tower-layer", "tower-service", "tracing", @@ -3233,7 +3220,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", ] [[package]] @@ -3296,9 +3283,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -3330,9 +3317,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "untrusted" @@ -3340,6 +3327,12 @@ 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 = "uuid" version = "1.4.1" @@ -3413,7 +3406,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3435,7 +3428,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3458,12 +3451,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -3475,7 +3468,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.11", + "rustix", ] [[package]] @@ -3496,9 +3489,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index e3761a1abc29..a9b92d997559 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -13,20 +13,20 @@ buildPecl rec { pname = "ddtrace"; - version = "0.92.2"; + version = "0.93.1"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; fetchSubmodules = true; - hash = "sha256-8h05ar16s1r1movP7zJgOsVAXJbU+Wi+wzmgVZ3nPbw="; + hash = "sha256-eiqwcSDwxkuYEsseHdjBE3KFnTnD/7BMyz/DNVAKUIA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "datadog-profiling-4.0.0" = "sha256-HoRELMxNkxkISscBksH4wMj/cuK/XQANr2WQUKwrevg="; + "datadog-profiling-5.0.0" = "sha256-/Z1vGpAHpU5EO80NXnzyAHN4s3iyA1jOquBS8MH1nOo="; }; }; From 65fe784fe478f0b0a7e17f861b7de5b4139a64c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:32:44 +0000 Subject: [PATCH 129/206] php81Extensions.redis: 6.0.1 -> 6.0.2 --- pkgs/development/php-packages/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index c334164087d9..4fc9d9464793 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, php, fetchFromGitHub }: let - version = "6.0.1"; + version = "6.0.2"; in buildPecl { inherit version; pname = "redis"; @@ -10,7 +10,7 @@ in buildPecl { repo = "phpredis"; owner = "phpredis"; rev = version; - hash = "sha256-0by0TC4TNFIzgMjoyuJG4EavMhkYqmn8TtRaVmgepfc="; + hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M="; }; internalDeps = with php.extensions; [ From 4b9a9938525ca9e57696d3a15c5b79e979feb75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:33:51 +0000 Subject: [PATCH 130/206] php81Extensions.phalcon: 5.3.1 -> 5.4.0 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index cbd689b136b9..87ea30233f9a 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -2,13 +2,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-FxGibpGlbNLqWDplCv4T4yUPg5US020niLfC7tHfkCU="; + hash = "sha256-svw+cYL5ISKk6jEvdFmLcC4hEzrFw3kIbDJsymt2tEs="; }; internalDeps = [ php.extensions.session php.extensions.pdo ]; From 41ea90d43a0e1ac4195ca7e3225a80e2f4d16a5d Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 3 Nov 2023 16:55:11 +1100 Subject: [PATCH 131/206] awsebcli: set mainProgram --- pkgs/tools/virtualization/awsebcli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 581b7ee70ec2..594b7a30b2ed 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -93,5 +93,6 @@ with localPython.pkgs; buildPythonApplication rec { changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; maintainers = with maintainers; [ eqyiel kirillrdy ]; license = licenses.asl20; + mainProgram = "eb"; }; } From e589c1b078a5fcfb98355eb5f6d50c1f0e4e2f08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:55:25 +0000 Subject: [PATCH 132/206] php81Packages.php-cs-fixer: 3.34.1 -> 3.37.1 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 2665a321fdb5..73b32488065e 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.34.1"; + version = "3.37.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-wVqGINDvVr11QDamo1SHmkwKuDqu8GRDFBNsk3C7mt8="; + sha256 = "sha256-zKPkxHPF8StDgs1DC+WKVvo3VGzs+lJElRHliKUXtcw="; }; dontUnpack = true; From e044c4e999c6d923c44b0a302326eaf3182cfcee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 05:58:43 +0000 Subject: [PATCH 133/206] php81Packages.phpcbf: 3.7.1 -> 3.7.2 --- pkgs/development/php-packages/phpcbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index 9a85a5ec47d3..41f860d6e073 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -2,14 +2,14 @@ let pname = "phpcbf"; - version = "3.7.1"; + version = "3.7.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "sha256-yTwOg8vaIcIfhJzPD0tCl50gAEpaYXLtDqJw7Keub6g="; + sha256 = "sha256-TspzKpl98IpMl+QyZuuBIvkW05uwAqAAYA/dU5P07+E="; }; dontUnpack = true; From fe4c776ae9c4289d848096fba1621b3c5c6d0bde Mon Sep 17 00:00:00 2001 From: the-furry-hubofeverything Date: Sun, 29 Oct 2023 20:39:27 -0700 Subject: [PATCH 134/206] blender: allow functional declaration within withPackages Based on #257780, separated since it introduces significant changes. bpycv: update passthru.tests.render blender-with-packages: deprecated it is still backwards compatible, but no longer preferred. --- .../manual/release-notes/rl-2311.section.md | 2 ++ pkgs/applications/misc/blender/default.nix | 9 +++++-- pkgs/applications/misc/blender/wrapper.nix | 24 ++++++++----------- .../python-modules/bpycv/default.nix | 8 +------ pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index ffe977bf33b1..4c2f8a84e4ef 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -337,6 +337,8 @@ - The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets. +- `blender-with-packages` has been deprecated in favor of `blender.withPackages`, for example `blender.withPackages (ps: [ps.bpycv])`. It behaves similarly to `python3.withPackages`. + - Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays. - `service.borgmatic.settings.location` and `services.borgmatic.configurations..location` are deprecated, please move your options out of sections to the global scope. diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 8e7fde6d9c29..7a6db59bf66d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -18,10 +18,13 @@ , openpgl , mesa , runCommand +, callPackage }: let - python = python310Packages.python; + pythonPackages = python310Packages; + inherit (pythonPackages) python; + buildEnv = callPackage ./wrapper.nix {}; optix = fetchzip { # url taken from the archlinux blender PKGBUILD url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; @@ -189,7 +192,9 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = { - inherit python; + inherit python pythonPackages; + + withPackages = f: let packages = f pythonPackages; in buildEnv.override { blender = finalAttrs.finalPackage; extraModules = packages; }; tests = { render = runCommand "${pname}-test" { } '' diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 3828d61a8645..7450827a8fa9 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -2,32 +2,28 @@ , lib , blender , makeWrapper -, python3Packages +, extraModules ? [] }: -{ name ? "wrapped" -, packages ? [] -}: -stdenv.mkDerivation { - pname = "blender-${name}"; - inherit (blender) version; +stdenv.mkDerivation (finalAttrs: { + pname = blender.pname + "-wrapped"; src = blender; - nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ]; + inherit (blender) version meta; + + nativeBuildInputs = [ blender.pythonPackages.wrapPython makeWrapper ]; installPhase = '' mkdir $out/{share/applications,bin} -p - sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop + sed 's/Exec=blender/Exec=${finalAttrs.finalPackage.pname}/g' $src/share/applications/blender.desktop > $out/share/applications/${finalAttrs.finalPackage.pname}.desktop cp -r $src/share/blender $out/share cp -r $src/share/doc $out/share cp -r $src/share/icons $out/share buildPythonPath "$pythonPath" - makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \ + makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \ --prefix PATH : $program_PATH \ --prefix PYTHONPATH : $program_PYTHONPATH ''; - pythonPath = packages; - - meta = blender.meta; -} + pythonPath = extraModules; +}) diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index a6d385e97781..4a3eb5b88f78 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -2,7 +2,6 @@ , lib , beautifulsoup4 , blender -, blender-with-packages , boxx , bpycv , buildPythonPackage @@ -52,13 +51,8 @@ buildPythonPackage rec { hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; }; - nativeBuildInputs = [ - ((blender-with-packages.override {inherit blender python3Packages;}) { - packages = [ bpycv ]; - }) - ]; } '' - blender-wrapped -b -P ${./bpycv-test.py} + ${blender.withPackages (ps: [ps.bpycv])}/bin/blender-wrapped -b -P ${./bpycv-test.py} ''; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38c4126a20f1..927a0b530d47 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,6 +92,9 @@ mapAliases ({ bird2 = bird; # Added 2022-02-21 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + blender-with-packages = args: + lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" + (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53d021424469..2d6f150549d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30674,8 +30674,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; - blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { }; - blender-hip = blender.override { hipSupport = true; }; blflash = callPackage ../tools/misc/blflash { }; From 506a12715a8e74ae760c76f63fa313d31448481e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 06:08:38 +0000 Subject: [PATCH 135/206] gromit-mpx: 1.5.0 -> 1.5.1 --- pkgs/tools/graphics/gromit-mpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index b131b4d0fb1e..d98ee8733a04 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-I2/9zRKpMkiB0IhnYuOrJHp4nNyG6pfful5D7OqCILQ="; + sha256 = "sha256-6sjps0wbB0sTaQtehRmz2KBWxqk3pqJmQs9htqxmJwo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; From 1d27a9eb5859d1cb24fce9e7da858b913d09e602 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 06:41:54 +0000 Subject: [PATCH 136/206] pixelorama: 0.11.2 -> 0.11.3 --- pkgs/applications/editors/pixelorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index 0ca79907f8e8..65e724df3db9 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -26,13 +26,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jSgSKxW7cxSoSwBytoaQtLwbkYm2udjmaZTHbN1jJwQ="; + sha256 = "sha256-+bQRUTEJluhcs5P87It9/oJOzrCcNFzDJVpixoQKXQc="; }; nativeBuildInputs = [ From 5bf69e4eb24852ae04f8a4de22bcb18ada82ce6c Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Wed, 1 Nov 2023 20:52:17 +0100 Subject: [PATCH 137/206] tmuxPlugins.tmux-fzf: unstable-2023-07-06 -> unstable-2023-10-24 --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 5705087ed6ae..bab1b1335d17 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -611,12 +611,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2023-07-06"; + version = "unstable-2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "51081a2688579228d860b3cb410f4437e857fc6e"; - sha256 = "sha256-qElRHAbnZ+qRasvkfo+lKNahRHklvLOH0BmbQ1oyN6A="; + rev = "d62b6865c0e7c956ad1f0396823a6f34cf7452a7"; + hash = "sha256-hVkSQYvBXrkXbKc98V9hwwvFp6z7/mX1K4N3N9j4NN4="; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' From cd49566990a37e4dcd0702f6189e656b81f9dca2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 07:24:11 +0000 Subject: [PATCH 138/206] cri-o-unwrapped: 1.28.1 -> 1.28.2 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index c6ee442d02fe..05de3c1626df 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-4RwR4aM+h0cqogJ9sxoODlPGaXH2PALFoBU3jv/6Agg="; + sha256 = "sha256-g9J66CZOAoco7UmK+xPEE6T5Aes3LWEG3J40LuDcvYo="; }; vendorHash = null; From 9ac60d31c0fa0bb2bbd7d166c4eaf19e9ba8db35 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Fri, 3 Nov 2023 07:26:41 +0000 Subject: [PATCH 139/206] eiwd: init at 2.8-1 (#208844) --- pkgs/by-name/ei/eiwd/package.nix | 83 ++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pkgs/by-name/ei/eiwd/package.nix diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix new file mode 100644 index 000000000000..16a8cd98f30b --- /dev/null +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, python3Packages # for tests +, openssl # for tests +, enableManpages ? true +, docutils # for manpages +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eiwd"; + version = "2.8-1"; + + src = fetchFromGitHub { + owner = "illiliti"; + repo = "eiwd"; + rev = finalAttrs.version; + hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY="; + fetchSubmodules = true; + }; + + outputs = [ + "out" "doc" + ] ++ lib.optionals enableManpages [ + "man" + ] ++ lib.optionals finalAttrs.doCheck [ + "test" + ]; + + postUnpack = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optionals enableManpages [ + docutils # only for the man pages + ]; + + checkInputs = [ + python3Packages.python + (lib.getBin openssl) + ]; + + configureFlags = [ + "--disable-dbus" + ] ++ lib.optionals (!enableManpages) [ + "--disable-manual-pages" + ]; + + enableParallelBuilding = true; + + # override this to false if you don't want to build python3 + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + # prevent the `install-data-local` Makefile rule from running; + # all it does is attempt to `mkdir` the `localstatedir`. + preInstall = '' + mkdir install-data-local + substituteInPlace Makefile --replace \ + '$(MKDIR_P) -m 700 $(DESTDIR)$(daemon_storagedir)' \ + 'true' + ''; + + postInstall = '' + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd + '' + lib.optionalString finalAttrs.doCheck '' + mkdir -p $test/bin + cp -a test/* $test/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/illiliti/eiwd/"; + description = "Fork of iwd (wifi daemon) which does not require dbus"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +}) From 431cbd53186ca51a30598529ce6fb4274c66af96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 09:08:58 +0100 Subject: [PATCH 140/206] gau: 2.2.0 -> 2.2.1 Diff: https://github.com/lc/gau/compare/v2.2.0...v2.2.1 --- pkgs/tools/security/gau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 1a67b89855f9..eea5df85162c 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-09Mf6KmTO3gper7txhvPZ/lb/cFOTDWicpu7+JrNrbo="; + sha256 = "sha256-AtKakeQnxRbFAbK/aQ4OQoEowN753jm4P4M57Oo3x1Y="; }; vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; From 56413652b7975585642446b78dad89eef9ec3eed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 09:09:16 +0100 Subject: [PATCH 141/206] exploitdb: 2023-11-02 -> 2023-11-03 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-11-02...2023-11-03 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a227705ec8df..e0c46ca61f06 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-11-02"; + version = "2023-11-03"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7j2HIYEYs1OcB919S3lLGYNsJzbkE3jIqq2MNCHG3lY="; + hash = "sha256-Ent0FQI2ZCmgQA98bZxGjKW12fj/0yicZ/UFUgfT0yw="; }; nativeBuildInputs = [ From 4119fc5b10221a2bcd0a976d7d4967ed4de33728 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 09:10:19 +0100 Subject: [PATCH 142/206] python311Packages.pyacaia-async: 0.0.8 -> 0.0.10 --- pkgs/development/python-modules/pyacaia-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyacaia-async/default.nix b/pkgs/development/python-modules/pyacaia-async/default.nix index 3001e33937f8..7d69f39ceb1e 100644 --- a/pkgs/development/python-modules/pyacaia-async/default.nix +++ b/pkgs/development/python-modules/pyacaia-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyacaia-async"; - version = "0.0.8"; + version = "0.0.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyacaia_async"; inherit version; - hash = "sha256-9aZmlw+u4fUa+TRh1COmViWAUQQ0MN2nFKY0t1hS+ko="; + hash = "sha256-hmzsZIIZsswUvy9AMgfXNC2v6H8Wvgdk9Qa4PoYmhCU="; }; nativeBuildInputs = [ From 92c106c09754a70dc6958c4af631ccb528799e8f Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 3 Nov 2023 17:05:25 +0800 Subject: [PATCH 143/206] nixos/firefox: update document link --- nixos/modules/programs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 85f47530cf5a..1edf935d1649 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -90,7 +90,7 @@ in description = mdDoc '' Group policies to install. - See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md) + See [Mozilla's documentation](https://mozilla.github.io/policy-templates/) for a list of available options. This can be used to install extensions declaratively! Check out the From bf40f8968d2a2fef9158e7b243873b4daabe59fb Mon Sep 17 00:00:00 2001 From: Jesse Abadilla Date: Thu, 2 Nov 2023 16:22:13 +0000 Subject: [PATCH 144/206] wp-cli: 2.6.0 -> 2.9.0 * Changelog: https://github.com/wp-cli/wp-cli/releases/tag/v2.9.0 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index a4ac97c9264f..c840be21cb49 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.6.0"; + version = "2.9.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; + hash = "sha256-r2t8zCHtCQfLUE21oFnw4SAReQWmAXv91Ddc7jyT2GQ="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From c2de1b6a9caa9b5841dceb7790b677dd46d4e1c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Nov 2023 06:20:16 +0000 Subject: [PATCH 145/206] debianutils: 5.13 -> 5.14 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 97623aaeef36..4d20c77dd5a3 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.13"; + version = "5.14"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-h6swRil0sldRaZT7/LMEmV6Ah3zoppiHeGO3xTJlrac="; + hash = "sha256-gbqtBFWq6KtmGLvGkmhpSHkpoDglfAT1KjDoZ4Y0SbI="; }; nativeBuildInputs = [ From 7e8ec59e83141c096431a72fdf7aedecf122c83a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 09:37:53 +0000 Subject: [PATCH 146/206] kube-linter: 0.6.4 -> 0.6.5 --- pkgs/development/tools/kube-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 5821a1753b88..bcacc28214bf 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L0JjbjV5KwI4qas8iLp5OLkleQlD29jsYLpe3ER1l2Y="; + sha256 = "sha256-gygzibpTpdVg1ZenAXIDHXYwAemlr6qkioE+GV52NkE="; }; - vendorHash = "sha256-1erG3TFv3DR6SLDIrmRefAPjXhgXEVYFiAsUPiI7kX4="; + vendorHash = "sha256-ZeAAvL5pOvHMAsDBe/0CBeayTsUrPDK5a5rAxHAu64o="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" From 5afd529264e0d3060f99305e82ef52b7c5a7bbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 3 Nov 2023 10:50:11 +0100 Subject: [PATCH 147/206] wasmtime: 14.0.2 -> 14.0.4 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index f2238eb5fa85..86b1317c2765 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "14.0.2"; + version = "14.0.4"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-/YAu2wIeDhMojWfutJSEp7SELOV4G/EfQjypLQI+jo8="; + hash = "sha256-VojHQDp6Vnr466coGkrBrrDVYBqpb985nXiQNpKdJ5g="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-4Ca3RlpJQ67zwje0SowqqEcBGLnht5QL/PCrrtFTc4o="; + cargoHash = "sha256-iNEtivaruSOKeD3NJ58TXSyvZSZE8A2GjKN63fKA55w="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From f4856b55ddcd50269e65720d1a76c77db25883a0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Oct 2023 09:37:56 +0200 Subject: [PATCH 148/206] nixos/fwupd: make auto-refresh run (and work) --- nixos/modules/services/hardware/fwupd.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 4e5913fd2751..7a938459d0cb 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -181,7 +181,18 @@ in { # required to update the firmware of disks services.udisks2.enable = true; - systemd.packages = [ cfg.package ]; + systemd = { + packages = [ cfg.package ]; + + # fwupd-refresh expects a user that we do not create, so just run with DynamicUser + # instead and ensure we take ownership of /var/lib/fwupd + services.fwupd-refresh.serviceConfig = { + DynamicUser = true; + StateDirectory = "fwupd"; + }; + + timers.fwupd-refresh.wantedBy = [ "timers.target" ]; + }; security.polkit.enable = true; }; From 471defcec7ffa063f891f47418a94b3c5c1b5c74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 09:55:53 +0000 Subject: [PATCH 149/206] cargo-temp: 0.2.18 -> 0.2.19 --- pkgs/development/tools/rust/cargo-temp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index 706e33235c6d..9df84462efa7 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-JUpXLdFaG653u9a4Nq7TC1ZNEcZ0QzgYMjGS8Kam0ec="; + hash = "sha256-vLD7M+Pg0BHJq9zDPeJLY+v/Vri/XtV3pQu0+ZE84Ew="; }; - cargoHash = "sha256-7yPvHCmdokb/oJqR3h+RJOQbE/pcrIDBltnG5zfoqMk="; + cargoHash = "sha256-NKT5AijwNm/BVhHGVAXq6sWBJYjSpq90TXHjlrihldo="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; From 39db890aa86b908f8d08e37affc62f0b1de802d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 09:56:27 +0000 Subject: [PATCH 150/206] gosu: 1.16 -> 1.17 --- pkgs/tools/misc/gosu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 6f08e027d8f8..bd3ba4c930d7 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gosu"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "tianon"; repo = "gosu"; rev = version; - hash = "sha256-UfrhrwsnDT7pfizQtQzqv/1FTMBTrk3qmtiR7ffwwhc="; + hash = "sha256-ziviUXqCpCGECewyZNLDKSjnpmz/3i5DKrIKZlLwl4o="; }; - vendorHash = "sha256-3HIAPI1bbfwE2/cUsQnp2Vz2uvlvSFDUrp2xuGNr8Gk="; + vendorHash = "sha256-fygLYSO0kpMFJd6WQp/uLYkELkyaOPZ9V8BrJcIcMuU="; ldflags = [ "-d" "-s" "-w" ]; From e00754f71eb04d6823ebf25a97e46f088bf2f183 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 10:18:20 +0000 Subject: [PATCH 151/206] libsForQt5.kquickimageedit: 0.2.0 -> 0.3.0 --- pkgs/development/libraries/kquickimageedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index 1089c3ddf1f1..7b81d8ca7c63 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -6,14 +6,14 @@ mkDerivation rec { pname = "kquickimageeditor"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; + sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; }; nativeBuildInputs = [ extra-cmake-modules ]; From 24ba848576a2c6e23cdd02d498a8adc1e99ebaff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 10:26:06 +0000 Subject: [PATCH 152/206] libsForQt5.kuserfeedback: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/kuserfeedback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix index bea9f86fc90d..5e1fe28297fd 100644 --- a/pkgs/development/libraries/kuserfeedback/default.nix +++ b/pkgs/development/libraries/kuserfeedback/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { pname = "kuserfeedback"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ="; + hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; From fdc1ddd305b92850fdf8e2ad1c06bf8f6dc26916 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Jul 2023 16:38:10 +0900 Subject: [PATCH 153/206] kssd: 1.1 -> 2.21 Diff: https://github.com/yhg926/public_kssd/compare/v1.1...v2.21 --- pkgs/applications/science/biology/kssd/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index 34d997252f5b..579042ec50bc 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -2,22 +2,21 @@ stdenv.mkDerivation rec { pname = "kssd"; - version = "1.1"; + version = "2.21"; src = fetchFromGitHub { owner = "yhg926"; repo = "public_kssd"; rev = "v${version}"; - sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY="; + hash = "sha256-D/s1jL2oKE0rSdRMVljskYFsw5UPOv1L95Of+K+e17w="; }; patches = [ - # Pull upstream patch for -fno-common toolchain support: - # https://github.com/yhg926/public_kssd/pull/9 + # https://github.com/yhg926/public_kssd/pull/11 (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch"; - sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4="; + name = "allocate-enough-memory.patch"; + url = "https://github.com/yhg926/public_kssd/commit/b1e66bbcc04687bc3201301cd742a0b26a87cb5d.patch"; + hash = "sha256-yFyJetpsGKeu+H6Oxrmn5ea4ESVtblb3YJDja4JEAEM="; }) ]; From 847c506eaece0913d4ca995e34bd4c84bac1cb19 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 14 Jul 2023 17:29:33 +0900 Subject: [PATCH 154/206] kssd: refactor --- .../science/biology/kssd/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index 579042ec50bc..200b70458ed3 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -1,13 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kssd"; version = "2.21"; src = fetchFromGitHub { owner = "yhg926"; repo = "public_kssd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-D/s1jL2oKE0rSdRMVljskYFsw5UPOv1L95Of+K+e17w="; }; @@ -20,11 +25,14 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ zlib libtool ]; + buildInputs = [ zlib ]; installPhase = '' - install -vD kssd $out/bin/kssd + runHook preInstall + + install -vD kssd $out/bin/kssd + + runHook postInstall ''; meta = with lib; { @@ -33,5 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yhg926/public_kssd"; maintainers = with maintainers; [ unode ]; platforms = [ "x86_64-linux" ]; + mainProgram = "kssd"; }; -} +}) From 10c3a4062187989d425cd4b0e8ef7e59377e1b6d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 18:00:30 +0900 Subject: [PATCH 155/206] kssd: enable aarch64-linux support & tests --- pkgs/applications/science/biology/kssd/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index 200b70458ed3..8f60b8b991ed 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , fetchpatch , zlib +, kssd +, runCommand }: stdenv.mkDerivation (finalAttrs: { @@ -35,12 +37,21 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + ${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -r ${kssd.src}/test_fna/seqs1 -o $out/reference + ${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -o $out/query ${kssd.src}/test_fna/seqs2 + ${lib.getExe kssd} dist -r $out/reference -o $out/distout $out/query + ''; + }; + meta = with lib; { description = "K-mer substring space decomposition"; license = licenses.asl20; homepage = "https://github.com/yhg926/public_kssd"; maintainers = with maintainers; [ unode ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; mainProgram = "kssd"; }; }) From 66be2216ebe0546d2dc302a83f3cd89b28ae57c7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Nov 2023 19:42:55 +0300 Subject: [PATCH 156/206] libsForQt5.networkmanager-qt: backport patches to fix NM 1.44 incompatibility Fixes #263985. --- .../kde-frameworks/networkmanager-qt.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index e9f812d68da8..a9d4baebf1c1 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -2,10 +2,25 @@ mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, + fetchpatch }: mkDerivation { pname = "networkmanager-qt"; + + # backport patches for NetworkManager 1.44 compatibility + # FIXME: remove in 5.112 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d9a938ddbfb5800503935926301ff2865ab77a6d.patch"; + hash = "sha256-EjFBcU0YJQocp8skDZUTxCQhfrtQP5Fdo8q1BC9lLnQ="; + }) + (fetchpatch { + url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d35c6cb97443424d228dfd8eee8282af6632b5f5.patch"; + hash = "sha256-KmRcCjdHGGk+5PY5JKNbk0BHCtdwibns+Hw4aNRaoZI="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; From 22c2e77aec3f607883f990da703827a9b7ccad4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 11:30:12 +0000 Subject: [PATCH 157/206] nkeys: 0.4.5 -> 0.4.6 --- pkgs/tools/system/nkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index 9914e6f14243..a9328067463a 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-txPd4Q/ApaNutt2Ik5E2478tHAQmpTJQKYnHA9niz3E="; + hash = "sha256-Sgj4+akOs/3fnpP0YDoRY9WwSk4uwtIPyPilutDXOlE="; }; - vendorHash = "sha256-ozK0vimYs7wGplw1QhSu+q8R+YsIYHU4m08a7K6i78I="; + vendorHash = "sha256-8EfOtCiYCGmhGtZdPiFyNzBj+QsPx67vwFDMZ6ATidc="; meta = with lib; { description = "Public-key signature system for NATS"; From 743688f91d0390ce1d27a3a294c88186f26c3574 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 11:30:16 +0000 Subject: [PATCH 158/206] rustypaste: 0.14.0 -> 0.14.1 --- pkgs/servers/rustypaste/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 76295880d494..0dc72f74bb2d 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bVy3/Ot4cb2Tr+wEDtWD3W2FYlXQVQ6tYC8DDyCiivY="; + sha256 = "sha256-9qP0/PGXRbQzSIsxUoGzbtc2KNg6SKrqGYcg/K6SuKo="; }; - cargoHash = "sha256-lCpp1VM6G36mFCm3u+4trsdFszd8SbUEgK1iIm/LwQ4="; + cargoHash = "sha256-76s3cWAKS6aeIG1ctHU6uCMWHDKsMcf5HWhUWzEuAkI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From e07082c5dc71ba144f1ecf6765899685de3a21a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 12:20:04 +0000 Subject: [PATCH 159/206] simpleitk: 2.3.0 -> 2.3.1 --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 8ef0e5e39a55..10e055d5acde 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-SJSFJEFu1qKowX5/98MslN7GFDS8aF5+EKkQ2983Azg="; + hash = "sha256-JmZUlIdcCQ9yEqxoUwRaxvr/Q7xZm41QA3mtDtoSdyI="; }; nativeBuildInputs = [ From f515d022554ee79ceead04dd3d2cd9d96a2f1b35 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 23 Oct 2023 12:46:34 +0200 Subject: [PATCH 160/206] gitlab: 16.4.1 -> 16.5.0 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.5.0-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 18 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab-elasticsearch-indexer/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 652 +++++++++--------- .../gitlab/rubyEnv/Gemfile.lock | 302 ++++---- .../gitlab/rubyEnv/gemset.nix | 315 ++++----- 9 files changed, 641 insertions(+), 674 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3566e85a2707..5192a8742cdd 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.4.1", - "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=", - "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l", + "version": "16.5.0", + "repo_hash": "sha256-w4xlNTwRGjevBdOw+qjZR/eG8gZDTSv9dTsV15r6dkw=", + "yarn_hash": "18l908cw4j7isnal9mjz62v6p4ikh48bhgpgkgc7zz68zjvkawkj", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.4.1-ee", + "rev": "v16.5.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.4.1", - "GITLAB_PAGES_VERSION": "16.4.1", - "GITLAB_SHELL_VERSION": "14.28.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9", - "GITLAB_WORKHORSE_VERSION": "16.4.1" + "GITALY_SERVER_VERSION": "16.5.0", + "GITLAB_PAGES_VERSION": "16.5.0", + "GITLAB_SHELL_VERSION": "14.29.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0", + "GITLAB_WORKHORSE_VERSION": "16.5.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f89f920c4c0b..c74e88cce0fa 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.4.1"; + version = "16.5.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,10 +17,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk="; + hash = "sha256-3TMf9XKaTaIYg93wWXnsj+ckmMWzX/fbwUIFu3y2AwM="; }; - vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o="; + vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 11e272e1bcc4..9a513a1590fd 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.3.9"; + version = "4.4.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg="; + sha256 = "sha256-Qywf5ACxXqY1iUZCsROTLmWeM8gFcqZvnClRo5DlnjY="; }; - vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA="; + vendorHash = "sha256-2dUlztXnr7OH/gQ0Q4jQpuO1MdkOy1O4BNGiY223DAA="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7810639eca74..f06c6d871add 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.4.1"; + version = "16.5.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-aUpuzgFbxMJwKjTn+QAudOeMBSLtLTjaTmwe25f6qxg="; + hash = "sha256-4oeJHhArBlwz+DERznUAGrHQtq9Na/c2Sn5Jyx+xcLM="; }; - vendorHash = "sha256-ko0ycT8HlqVfXf7tck0xcs6rDJMpHxjSoI59gTLgqDQ="; + vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 01b119326396..6dd006e029f8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.28.0"; + version = "14.29.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-w/Td4J4t/xrkR5LmFTcAD5U9ZR3HDGqLNxpjkDC0pi4="; + sha256 = "sha256-MhvFLBH0CLiGNTEjHy7vDhLE3YsvbBL8XRNytPEa6uU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-EIJSBUUsWvA93OAyBNey2WA2sV+7YSWbsC1RnWf6nrI="; + vendorHash = "sha256-g1ZaRY0A7oREByNicPvnuxakYrNQNXg4Vy94iyNVdDY="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 690af3a806d4..178aa0760245 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.4.1"; + version = "16.5.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-C6FVTOY3CdO2y6mKuvgEWDZnWevRTxeOefRF2EbXDv8="; + vendorHash = "sha256-m8cDhI6DzFnSEZscZQfFm8l9MTJqTqxhBFJeTX1HWiE="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d9ee8a8ae714..2107186fe159 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,555 +8,561 @@ if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this BundlerChecksum.patch! end -gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false +# Please see https://docs.gitlab.com/ee/development/feature_categorization/#gemfile +ignore_feature_category = Module.new do + def gem(*arguments, feature_category: nil, **keyword_arguments) # rubocop:disable Lint/UnusedMethodArgument + super(*arguments, **keyword_arguments) + end +end + +extend ignore_feature_category + +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.6' +gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'vite_rails' +gem 'vite_rails' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'bootsnap', '~> 1.16.0', require: false +gem 'bootsnap', '~> 1.16.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'openssl', '~> 3.0' -gem 'ipaddr', '~> 1.2.5' +gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Monorepo Gems group :monorepo do - gem 'gitlab-utils', path: 'gems/gitlab-utils' + gem 'gitlab-utils', path: 'gems/gitlab-utils' # rubocop:todo Gemfile/MissingFeatureCategory end # Responders respond_to and respond_with -gem 'responders', '~> 3.0' +gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sprockets', '~> 3.7.0' +gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.5.0' +gem 'view_component', '~> 3.6.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.4' +gem 'pg', '~> 1.5.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'neighbor', '~> 0.2.3' +gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rugged', '~> 1.6' -gem 'grape-path-helpers', '~> 1.7.1' +gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.11.1' +gem 'faraday', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization -gem 'declarative_policy', '~> 1.1.0' +gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Authentication libraries -gem 'devise', '~> 4.8.1' -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' -gem 'bcrypt', '~> 3.1', '>= 3.1.14' -gem 'doorkeeper', '~> 5.6', '>= 5.6.6' -gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' -gem 'rexml', '~> 3.2.6' -gem 'ruby-saml', '~> 1.15.0' -gem 'omniauth', '~> 2.1.0' -gem 'omniauth-auth0', '~> 3.1' -gem 'omniauth-azure-activedirectory-v2', '~> 2.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md -gem 'omniauth-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 2.0.1' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.0.1' -gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md -gem 'omniauth-google-oauth2', '~> 1.1' -gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 2.1.0' -gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' -gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md -gem 'omniauth_openid_connect', '~> 0.6.1' +gem 'devise', '~> 4.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-twitter', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. -gem 'openid_connect', '= 1.3.0' -gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md -gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.21.3' -gem 'jwt', '~> 2.5' +gem 'openid_connect', '= 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'jwt', '~> 2.5' # rubocop:todo Gemfile/MissingFeatureCategory # Kerberos authentication. EE-only -gem 'gssapi', '~> 1.3.1', group: :kerberos -gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos +gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory +gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory # Spam and anti-bot protection -gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' -gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 2.1.0' +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'akismet', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Two-factor authentication -gem 'devise-two-factor', '~> 4.0.2' -gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' +gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rqrcode', '~> 2.0', feature_category: :system_access + +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Pages -gem 'validates_hostname', '~> 1.0.13' -gem 'rubyzip', '~> 2.3.2', require: 'zip' +gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0' +gem 'acme-client', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Browser detection -gem 'browser', '~> 5.3.1' +gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory # OS detection for usage ping -gem 'ohai', '~> 17.9' +gem 'ohai', '~> 17.9' # rubocop:todo Gemfile/MissingFeatureCategory # GPG -gem 'gpgme', '~> 2.0.23' +gem 'gpgme', '~> 2.0.23' # rubocop:todo Gemfile/MissingFeatureCategory # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.17.1' +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API -gem 'grape', '~> 1.7.1' -gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' -gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] -gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] +gem 'grape', '~> 1.7.1', feature_category: :api +gem 'grape-entity', '~> 0.10.0', feature_category: :api +gem 'grape-swagger', '~> 1.6.1', group: [:development, :test], feature_category: :api +gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api +gem 'grape-path-helpers', '~> 1.7.1', feature_category: :api +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 1.13.19' -gem 'graphiql-rails', '~> 1.8.0' -gem 'apollo_upload_server', '~> 2.1.0' -gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] -gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) +gem 'graphql', '~> 2.0.27', feature_category: :api +gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api +gem 'graphiql-rails', '~> 1.8.0', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.0', feature_category: :api +gem 'graphlient', '~> 0.5.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data -gem 'ffaker', '~> 2.10' +gem 'ffaker', '~> 2.10' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'hashie', '~> 5.0.0' +gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory # Pagination -gem 'kaminari', '~> 1.2.2' +gem 'kaminari', '~> 1.2.2' # rubocop:todo Gemfile/MissingFeatureCategory # HAML -gem 'hamlit', '~> 2.15.0' +gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory # Files attachments -gem 'carrierwave', '~> 1.3' -gem 'mini_magick', '~> 4.10.1' +gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mini_magick', '~> 4.10.1' # rubocop:todo Gemfile/MissingFeatureCategory # for backups -gem 'fog-aws', '~> 3.18' +gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.19', require: 'fog/google' -gem 'fog-local', '~> 0.8' +gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-google', '~> 1.19', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, # which may have knock-on effects on other features using `RestClient`. # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 -gem 'fog-aliyun', '~> 0.4' -gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' +gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory # for Google storage -gem 'google-cloud-storage', '~> 1.44.0' -gem 'google-apis-core', '~> 0.10.0' -gem 'google-apis-compute_v1', '~> 0.57.0' -gem 'google-apis-container_v1', '~> 0.43.0' -gem 'google-apis-container_v1beta1', '~> 0.43.0' -gem 'google-apis-cloudbilling_v1', '~> 0.21.0' -gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' -gem 'google-apis-iam_v1', '~> 0.36.0' -gem 'google-apis-serviceusage_v1', '~> 0.28.0' -gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' -gem 'google-apis-androidpublisher_v3', '~> 0.34.0' +gem 'google-cloud-storage', '~> 1.44.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-core', '~> 0.10.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-cloudbilling_v1', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-iam_v1', '~> 0.36.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory # Seed data -gem 'seed-fu', '~> 2.3.7' +gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory # Search -gem 'elasticsearch-model', '~> 7.2' -gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.181.1' -gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.134.0' -gem 'faraday_middleware-aws-sigv4', '~>0.3.0' -gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections +gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.185.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory # Markdown and HTML processing -gem 'html-pipeline', '~> 2.14.3' -gem 'deckar01-task_list', '2.3.3' -gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.10' -gem 'kramdown', '~> 2.3.1' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.3.2' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.18' -gem 'asciidoctor-include-ext', '~> 0.4.0', require: false -gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.8.0', require: false -gem 'rouge', '~> 4.1.3' -gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.15', '>= 1.15.4' +gem 'html-pipeline', '~> 2.14.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'deckar01-task_list', '2.3.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'commonmarker', '~> 0.23.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'RedCloth', '~> 4.3.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'org-ruby', '~> 0.9.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'creole', '~> 0.5.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'wikicloth', '0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-include-ext', '~> 0.4.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rouge', '~> 4.1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'nokogiri', '~> 1.15', '>= 1.15.4' # rubocop:todo Gemfile/MissingFeatureCategory # Calendar rendering -gem 'icalendar' +gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory # Diffs -gem 'diffy', '~> 3.4' -gem 'diff_match_patch', '~> 0.1.0' +gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'diff_match_patch', '~> 0.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Application server -gem 'rack', '~> 2.2.8' +gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingFeatureCategory # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' +gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do - gem 'puma', '~> 6.3', '>= 6.3.1', require: false - gem 'sd_notify', '~> 0.1.0', require: false + gem 'puma', '~> 6.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end # State machine -gem 'state_machines-activerecord', '~> 0.8.0' +gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # CI domain tags -gem 'acts-as-taggable-on', '~> 9.0' +gem 'acts-as-taggable-on', '~> 9.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', '~> 6.5.7' -gem 'sidekiq-cron', '~> 1.8.0' -gem 'redis-namespace', '~> 1.9.0' -gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' +gem 'sidekiq', '~> 6.5.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq-cron', '~> 1.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-namespace', '~> 1.9.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory # Cron Parser -gem 'fugit', '~> 1.8.1' +gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory # HTTP requests -gem 'httparty', '~> 0.21.0' +gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory # Colored output to console -gem 'rainbow', '~> 3.0' +gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Progress bar -gem 'ruby-progressbar', '~> 1.10' +gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory # Linear-time regex library for untrusted regular expressions -gem 're2', '2.0.0' +gem 're2', '2.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 1.2.1' -gem 'version_sorter', '~> 2.3' -gem 'csv_builder', path: 'gems/csv_builder' +gem 'semver_dialects', '~> 1.2.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.8' +gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory # User agent parsing -gem 'device_detector' +gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis', '~> 4.8.0' -gem 'connection_pool', '~> 2.0' +gem 'redis', '~> 4.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.3.0' +gem 'redis-actionpack', '~> 5.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Discord integration -gem 'discordrb-webhooks', '~> 3.4', require: false +gem 'discordrb-webhooks', '~> 3.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Jira integration -gem 'jira-ruby', '~> 2.1.4' -gem 'atlassian-jwt', '~> 0.2.0' +gem 'jira-ruby', '~> 2.1.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'atlassian-jwt', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Slack integration -gem 'slack-messenger', '~> 2.3.4' - -# Hangouts Chat integration -gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' - -# Asana integration -gem 'asana', '~> 0.10.13' +gem 'slack-messenger', '~> 2.3.4' # rubocop:todo Gemfile/MissingFeatureCategory # FogBugz integration -gem 'ruby-fogbugz', '~> 0.3.0' +gem 'ruby-fogbugz', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Kubernetes integration -gem 'kubeclient', '~> 4.11.0' +gem 'kubeclient', '~> 4.11.0' # rubocop:todo Gemfile/MissingFeatureCategory # AI -gem 'ruby-openai', '~> 3.7' -gem 'circuitbox', '2.0.0' +gem 'ruby-openai', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'circuitbox', '2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sanitize user input -gem 'sanitize', '~> 6.0.2' -gem 'babosa', '~> 2.0' +gem 'sanitize', '~> 6.0.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'babosa', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sanitizes SVG input -gem 'loofah', '~> 2.21.3' +gem 'loofah', '~> 2.21.4' # rubocop:todo Gemfile/MissingFeatureCategory # Used to provide license templates -gem 'licensee', '~> 9.16' +gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.7' +gem 'charlock_holmes', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory # Detect mime content type from content -gem 'ruby-magic', '~> 0.6' +gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory # Faster blank -gem 'fast_blank', '~> 1.0.1' +gem 'fast_blank', '~> 1.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Parse time & duration -gem 'gitlab-chronic', '~> 0.10.5' -gem 'gitlab_chronic_duration', '~> 0.11' +gem 'gitlab-chronic', '~> 0.10.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rack-proxy', '~> 0.7.7' +gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sassc-rails', '~> 2.1.0' -gem 'autoprefixer-rails', '10.2.5.1' -gem 'terser', '1.0.2' +gem 'sassc-rails', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'autoprefixer-rails', '10.2.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' -gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.7' -gem 'gon', '~> 6.4.0' -gem 'request_store', '~> 1.5.1' -gem 'base32', '~> 0.3.0' +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'tanuki_emoji', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.3' +gem 'gitlab-license', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Protect against bruteforcing -gem 'rack-attack', '~> 6.7.0' +gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-raven', '~> 3.1' -gem 'sentry-ruby', '~> 5.8.0' -gem 'sentry-rails', '~> 5.8.0' -gem 'sentry-sidekiq', '~> 5.8.0' +gem 'sentry-raven', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-ruby', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-rails', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-sidekiq', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # PostgreSQL query parsing # -gem 'pg_query', '~> 4.2.3' +gem 'pg_query', '~> 4.2.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'premailer-rails', '~> 1.10.3' +gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-labkit', '~> 0.34.0' -gem 'thrift', '>= 0.16.0' +gem 'gitlab-labkit', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n -gem 'rails-i18n', '~> 7.0' -gem 'gettext_i18n_rails', '~> 1.11.0' -gem 'gettext_i18n_rails_js', '~> 1.3' -gem 'gettext', '~> 3.3', require: false, group: :development +gem 'rails-i18n', '~> 7.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext_i18n_rails', '~> 1.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext_i18n_rails_js', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext', '~> 3.3', require: false, group: :development # rubocop:todo Gemfile/MissingFeatureCategory -gem 'batch-loader', '~> 2.0.1' +gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Perf bar -gem 'peek', '~> 1.1' +gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory # Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.8.0' +gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics -gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.28', require: 'prometheus/client' +gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'warning', '~> 1.3.0' +gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do - gem 'lefthook', '~> 1.4.7', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false + gem 'lefthook', '~> 1.5.2', require: false, feature_category: :tooling + gem 'rubocop', feature_category: :tooling + gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 2.0', '>= 2.0.1' + gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.0', '>= 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler - gem 'better_errors', '~> 2.10.1' + gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'sprite-factory', '~> 1.7' + gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem "listen", "~> 3.7" + gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory end group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 7.0.2' - gem 'parser', '~> 3.2', '>= 3.2.2.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.6.4' + gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'bullet', '~> 7.1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'awesome_print', require: false + gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 6.0.3' + gem 'database_cleaner', '~> 1.7.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' + gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'spring', '~> 4.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' + gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 10.1.0', require: false + gem 'gitlab-styles', '~> 10.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'haml_lint', '~> 0.40.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false + gem 'haml_lint', '~> 0.40.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.11.0', require: false - gem 'benchmark-memory', '~> 0.1', require: false + gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false + # Profiling data from CI/CD pipelines + gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'simple_po_parser', '~> 1.1.6', require: false + gem 'knapsack', '~> 1.21.1', feature_category: :tooling + gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling + gem 'test_file_finder', '~> 0.1.3', feature_category: :tooling - gem 'png_quantizator', '~> 0.2.1', require: false + gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parallel', '~> 1.19', require: false + gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test_file_finder', '~> 0.1.3' + gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pact', '~> 1.63' + gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.0.0', require: false + gem 'gitlab-dangerfiles', '~> 4.3.2', require: false, feature_category: :tooling end group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 2.1.0', require: false - gem 'undercover', '~> 0.4.4', require: false + gem 'simplecov', '~> 0.21', require: false, feature_category: :tooling + gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling + gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling + gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling end # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false + gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end # Gems required in various pipelines group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec' - gem 'rspec_flaky', path: 'gems/rspec_flaky' + gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec_flaky', path: 'gems/rspec_flaky' # rubocop:todo Gemfile/MissingFeatureCategory end group :test do - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.2' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', '~> 1.0', require: false + gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling + gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling - gem 'capybara', '~> 3.39', '>= 3.39.2' - gem 'capybara-screenshot', '~> 1.0.26' - gem 'selenium-webdriver', '= 4.12.0' + gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.14' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'graphlyte', '~> 1.0.0' + gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'shoulda-matchers', '~> 5.1.0', require: false - gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.19.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 1.2.2' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - gem 'axe-core-rspec' + gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'test-prof', '~> 1.2.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false + gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false + gem 'gitlab_quality-test_tooling', '~> 1.3.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end -gem 'octokit', '~> 6.0' +gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'email_reply_trimmer', '~> 0.1' -gem 'html2text' +gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'stackprof', '~> 0.2.25', require: false -gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 1.0', require: false -gem 'activerecord-explain-analyze', '~> 0.1', require: false +gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # OAuth -gem 'oauth2', '~> 2.0' +gem 'oauth2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Health check -gem 'health_check', '~> 3.0' +gem 'health_check', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # System information -gem 'vmstat', '~> 2.3.0' -gem 'sys-filesystem', '~> 1.4.3' +gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory # NTP client -gem 'net-ntp' +gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory # SSH keys support -gem 'ssh_data', '~> 1.3' +gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Spamcheck GRPC protocol definitions -gem 'spamcheck', '~> 1.3.0' +gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.3.0-rc1' +gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfile/MissingFeatureCategory # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.2.0' +gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'grpc', '~> 1.55.0' +gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-protobuf', '~> 3.24', '>= 3.24.3' +gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'toml-rb', '~> 2.2.0' +gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Feature toggles -gem 'flipper', '~> 0.26.2' -gem 'flipper-active_record', '~> 0.26.2' -gem 'flipper-active_support_cache_store', '~> 0.26.2' -gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.8.0' +gem 'flipper', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'flipper-active_record', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'flipper-active_support_cache_store', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'unleash', '~> 3.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-experiment', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Structured logging -gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.8' +gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grape_logging', '~> 1.8', feature_category: :api # DNS Lookup -gem 'gitlab-net-dns', '~> 0.9.2' +gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list -gem 'countries', '~> 4.0.0' +gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'retriable', '~> 3.1.2' +gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory # LRU cache -gem 'lru_redux' +gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` @@ -565,62 +571,62 @@ gem 'lru_redux' # `config/initializers/mail_starttls_patch.rb` has also been patched to # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is # released. -gem 'mail', '= 2.8.1' -gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false +gem 'mail', '= 2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # rubocop:todo Gemfile/MissingFeatureCategory # File encryption -gem 'lockbox', '~> 1.3.0' +gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Email validation -gem 'valid_email', '~> 0.1' +gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON -gem 'jsonb_accessor', '~> 1.3.10' -gem 'json', '~> 2.6.3' -gem 'json_schemer', '~> 0.2.18' -gem 'oj', '~> 3.13.21' -gem 'oj-introspect', '~> 0.7' -gem 'multi_json', '~> 1.14.1' -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' +gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json', '~> 2.6.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json_schemer', '~> 0.2.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'multi_json', '~> 1.14.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'webauthn', '~> 3.0' +gem 'webauthn', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # IPAddress utilities -gem 'ipaddress', '~> 0.8.3' +gem 'ipaddress', '~> 0.8.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'parslet', '~> 1.8' +gem 'parslet', '~> 1.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ed25519', '~> 1.3.0' +gem 'ed25519', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # rubocop:todo Gemfile/MissingFeatureCategory # Vulnerability advisories -gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/MissingFeatureCategory # Work with RPM packages -gem 'arr-pm', '~> 0.0.12' +gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.0.22.pre.alpha1' +gem 'devfile', '~> 0.0.23.pre.alpha1' # rubocop:todo Gemfile/MissingFeatureCategory # Apple plist parsing -gem 'CFPropertyList', '~> 3.0.0' -gem 'app_store_connect' +gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'app_store_connect' # rubocop:todo Gemfile/MissingFeatureCategory # For phone verification -gem 'telesignenterprise', '~> 2.2' +gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt -gem 'net-protocol', '~> 0.1.3' +gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Lock this until we make DNS rebinding work with the updated net-http: # https://gitlab.com/gitlab-org/gitlab/-/issues/413528 -gem 'net-http', '= 0.1.1' +gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'duo_api', '~> 1.3' +gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2a8f80bf3939..052a59d6b7f7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -23,6 +23,16 @@ PATH error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) +PATH + remote: gems/gitlab-http + specs: + gitlab-http (0.1.0) + activesupport (~> 7) + httparty (~> 0.21.0) + ipaddress (~> 0.8.3) + nokogiri (~> 1.15.4) + railties (~> 7) + PATH remote: gems/gitlab-rspec specs: @@ -64,7 +74,7 @@ PATH remote: gems/rspec_flaky specs: rspec_flaky (0.1.0) - activesupport (>= 6.1, < 7.1) + activesupport (>= 6.1, < 8) rspec (~> 3.0) PATH @@ -155,70 +165,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.6) - actionpack (= 7.0.6) - activesupport (= 7.0.6) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.6) - actionpack (= 7.0.6) - activejob (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.6) - actionpack (= 7.0.6) - actionview (= 7.0.6) - activejob (= 7.0.6) - activesupport (= 7.0.6) + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.6) - actionview (= 7.0.6) - activesupport (= 7.0.6) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.6) - actionpack (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.6) - activesupport (= 7.0.6) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.6) - activesupport (= 7.0.6) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (7.0.6) - activesupport (= 7.0.6) - activerecord (7.0.6) - activemodel (= 7.0.6) - activesupport (= 7.0.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.6) - actionpack (= 7.0.6) - activejob (= 7.0.6) - activerecord (= 7.0.6) - activesupport (= 7.0.6) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.6) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -240,11 +250,6 @@ GEM activesupport (>= 6.0.0) jwt (>= 1.4, <= 2.5.0) arr-pm (0.0.12) - asana (0.10.13) - faraday (~> 1.0) - faraday_middleware (~> 1.0) - faraday_middleware-multi_json (~> 0.0) - oauth2 (>= 1.4, < 3) asciidoctor (2.0.18) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) @@ -265,7 +270,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.181.1) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -273,7 +278,7 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) @@ -321,12 +326,12 @@ GEM msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) - bullet (7.0.2) + bullet (7.1.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.7.0.1) + bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) - thor (>= 0.18, < 2) + thor (~> 1.0) byebug (11.1.3) capybara (3.39.2) addressable @@ -340,7 +345,7 @@ GEM capybara-screenshot (1.0.26) capybara (>= 1.0, < 4) launchy - carrierwave (1.3.3) + carrierwave (1.3.4) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -357,7 +362,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-utils (16.10.17) - chunky_png (1.3.5) + chunky_png (1.4.0) circuitbox (2.0.0) citrus (3.0.2) claide (1.1.0) @@ -371,7 +376,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.10) concurrent-ruby (1.2.2) - connection_pool (2.3.0) + connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) cose (1.3.0) @@ -405,6 +410,7 @@ GEM danger-gitlab (8.0.0) danger gitlab (~> 4.2, >= 4.2.0) + dartsass (1.49.8) database_cleaner (1.7.0) date (3.3.3) dead_end (3.1.1) @@ -429,7 +435,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.22.pre.alpha1) + devfile (0.0.23.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -437,11 +443,11 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (4.0.2) - activesupport (< 7.1) - attr_encrypted (>= 1.3, < 4, != 2) + devise-two-factor (4.1.1) + activesupport (~> 7.0) + attr_encrypted (>= 1.3, < 5, != 2) devise (~> 4.0) - railties (< 7.1) + railties (~> 7.0) rotp (~> 6.0) diff-lcs (1.5.0) diff_match_patch (0.1.0) @@ -500,7 +506,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) erubi (1.12.0) - escape_utils (1.2.1) + escape_utils (1.3.0) et-orbi (1.2.7) tzinfo ethon (0.16.0) @@ -510,8 +516,8 @@ GEM expgen (0.1.1) parslet expression_parser (0.9.0) - extended-markdown-filter (0.6.0) - html-pipeline (~> 2.0) + extended-markdown-filter (0.7.0) + html-pipeline (~> 2.9) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -547,9 +553,6 @@ GEM faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) faraday (>= 0.15) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.10.0) @@ -637,17 +640,17 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.3.0.pre.rc1) + gitaly (16.5.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (4.0.0) + gitlab-dangerfiles (4.3.2) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) - rake + rake (~> 13.0) gitlab-experiment (0.8.0) activesupport (>= 3.0) request_store (>= 1.0) @@ -678,15 +681,15 @@ GEM rubocop-performance (~> 1.15) rubocop-rails (~> 2.17) rubocop-rspec (~> 2.22) - gitlab_chronic_duration (0.11.0) + gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.0.0) - activesupport (>= 6.1, < 7.1) + gitlab_quality-test_tooling (1.3.0) + activesupport (>= 6.1, < 7.2) gitlab (~> 4.19) http (~> 5.0) nokogiri (~> 1.10) @@ -755,7 +758,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.24.3) + google-protobuf (3.24.4) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -802,19 +805,19 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (1.13.19) - graphql-client (0.17.0) + graphql (2.0.27) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.10) - graphql-docs (2.1.0) - commonmarker (~> 0.16) + graphql + graphql-docs (4.0.0) + commonmarker (~> 0.23, >= 0.23.6) + dartsass (~> 1.49) escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) - graphql (~> 1.12) - html-pipeline (~> 2.9) - sass (~> 3.4) - grpc (1.55.0) + graphql (~> 2.0) + html-pipeline (~> 2.14, >= 2.14.3) + grpc (1.58.0) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) gssapi (1.3.1) @@ -847,7 +850,6 @@ GEM thor tilt hana (1.3.7) - hangouts-chat (0.0.5) hashdiff (1.0.1) hashie (5.0.0) health_check (3.1.0) @@ -883,6 +885,7 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) + influxdb-client (2.9.0) invisible_captcha (2.1.0) rails (>= 5.2) ipaddr (1.2.5) @@ -946,7 +949,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.4.7) + lefthook (1.5.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -981,7 +984,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) lookbook (2.0.1) @@ -1011,9 +1014,9 @@ GEM memoist (0.16.2) memory_profiler (1.0.1) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.1003) mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) @@ -1098,7 +1101,7 @@ GEM hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (2.0.1) + omniauth-alicloud (3.0.0) omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) @@ -1184,7 +1187,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1210,7 +1213,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.28.0) + prometheus-client-mmap (0.28.1) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1225,7 +1228,7 @@ GEM tty-markdown tty-prompt public_suffix (5.0.0) - puma (6.3.1) + puma (6.4.0) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1250,20 +1253,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.6) - actioncable (= 7.0.6) - actionmailbox (= 7.0.6) - actionmailer (= 7.0.6) - actionpack (= 7.0.6) - actiontext (= 7.0.6) - actionview (= 7.0.6) - activejob (= 7.0.6) - activemodel (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 7.0.6) + railties (= 7.0.8) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1276,9 +1279,9 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.6) - actionpack (= 7.0.6) - activesupport (= 7.0.6) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -1295,8 +1298,7 @@ GEM optimist (>= 3.0.0) rbtree (0.4.6) rchardet (1.8.0) - rdoc (6.3.2) - re2 (2.0.0) + re2 (2.1.3) mini_portile2 (~> 2.8.4) recaptcha (5.12.3) json @@ -1335,12 +1337,12 @@ GEM nokogiri rexml (3.2.6) rinku (2.0.0) - rotp (6.2.0) + rotp (6.3.0) rouge (4.1.3) - rqrcode (0.7.0) - chunky_png - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) + rqrcode (2.2.0) + chunky_png (~> 1.0) + rqrcode_core (~> 1.0) + rqrcode_core (1.2.0) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -1439,11 +1441,6 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass (3.5.5) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.0) @@ -1459,7 +1456,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.12.0) + selenium-webdriver (4.14.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -1580,11 +1577,11 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.2.2) + test-prof (1.2.3) test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) @@ -1649,7 +1646,7 @@ GEM unparser (0.6.7) diff-lcs (~> 1.3) parser (>= 3.2.0) - uri (0.12.1) + uri (0.12.2) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1665,7 +1662,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.5.0) + view_component (3.6.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1701,8 +1698,8 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - websocket (1.2.9) - websocket-driver (0.7.5) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wikicloth (0.8.1) @@ -1735,7 +1732,6 @@ DEPENDENCIES apollo_upload_server (~> 2.1.0) app_store_connect arr-pm (~> 0.0.12) - asana (~> 0.10.13) asciidoctor (~> 2.0.18) asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.8.0) @@ -1745,8 +1741,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.181.1) - aws-sdk-s3 (~> 1.134.0) + aws-sdk-core (~> 3.185.1) + aws-sdk-s3 (~> 1.136.0) axe-core-rspec babosa (~> 2.0) base32 (~> 0.3.0) @@ -1757,8 +1753,8 @@ DEPENDENCIES better_errors (~> 2.10.1) bootsnap (~> 1.16.0) browser (~> 5.3.1) - bullet (~> 7.0.2) - bundler-audit (~> 0.7.0.1) + bullet (~> 7.1.1) + bundler-audit (~> 0.9.1) bundler-checksum (~> 0.1.0)! capybara (~> 3.39, >= 3.39.2) capybara-screenshot (~> 1.0.26) @@ -1769,7 +1765,7 @@ DEPENDENCIES cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) - connection_pool (~> 2.0) + connection_pool (~> 2.4) countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) @@ -1780,11 +1776,11 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.22.pre.alpha1) + devfile (~> 0.0.23.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! - devise-two-factor (~> 4.0.2) + devise-two-factor (~> 4.1.1) diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) @@ -1816,11 +1812,12 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.11.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 16.3.0.pre.rc1) + gitaly (~> 16.5.0.pre.rc1) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.0.0) + gitlab-dangerfiles (~> 4.3.2) gitlab-experiment (~> 0.8.0) gitlab-fog-azure-rm (~> 1.8.0) + gitlab-http! gitlab-labkit (~> 0.34.0) gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.23) @@ -1832,9 +1829,9 @@ DEPENDENCIES gitlab-sidekiq-fetcher! gitlab-styles (~> 10.1.0) gitlab-utils! - gitlab_chronic_duration (~> 0.11) + gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.0.0) + gitlab_quality-test_tooling (~> 1.3.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1847,7 +1844,7 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.24, >= 3.24.3) + google-protobuf (~> 3.24, >= 3.24.4) gpgme (~> 2.0.23) grape (~> 1.7.1) grape-entity (~> 0.10.0) @@ -1858,20 +1855,20 @@ DEPENDENCIES graphiql-rails (~> 1.8.0) graphlient (~> 0.5.0) graphlyte (~> 1.0.0) - graphql (~> 1.13.19) - graphql-docs (~> 2.1.0) - grpc (~> 1.55.0) + graphql (~> 2.0.27) + graphql-docs (~> 4.0.0) + grpc (~> 1.58.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.40.0) hamlit (~> 2.15.0) - hangouts-chat (~> 0.0.5) hashie (~> 5.0.0) health_check (~> 3.0) html-pipeline (~> 2.14.3) html2text httparty (~> 0.21.0) icalendar + influxdb-client (~> 2.9) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) @@ -1887,14 +1884,14 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.4.7) + lefthook (~> 1.5.2) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.16) listen (~> 3.7) lockbox (~> 1.3.0) lograge (~> 0.5) - loofah (~> 2.21.3) + loofah (~> 2.21.4) lookbook (~> 2.0, >= 2.0.1) lru_redux mail (= 2.8.1) @@ -1917,7 +1914,7 @@ DEPENDENCIES oj (~> 3.13.21) oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 2.0.1) + omniauth-alicloud (~> 3.0.0) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) @@ -1939,31 +1936,30 @@ DEPENDENCIES org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) - parser (~> 3.2, >= 3.2.2.3) + parser (~> 3.2, >= 3.2.2.4) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.4) pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.28) + prometheus-client-mmap (~> 0.28, >= 0.28.1) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (~> 6.3, >= 6.3.1) + puma (~> 6.4) rack (~> 2.2.8) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.6) + rails (~> 7.0.8) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) - rdoc (~> 6.3.2) - re2 (= 2.0.0) + re2 (= 2.1.3) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) @@ -1973,7 +1969,7 @@ DEPENDENCIES retriable (~> 3.1.2) rexml (~> 3.2.6) rouge (~> 4.1.3) - rqrcode-rails3 (~> 0.1.7) + rqrcode (~> 2.0) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) rspec-rails (~> 6.0.3) @@ -1993,7 +1989,7 @@ DEPENDENCIES sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (= 4.12.0) + selenium-webdriver (~> 4.14) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) @@ -2022,7 +2018,7 @@ DEPENDENCIES tanuki_emoji (~> 0.7) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.2.2) + test-prof (~> 1.2.3) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2034,7 +2030,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.5.0) + view_component (~> 3.6.0) vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) @@ -2045,4 +2041,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.19 + 2.4.20 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 6dcac890ea76..e239df5e9e94 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -248,17 +248,6 @@ src: }; version = "0.0.12"; }; - asana = { - dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6pqazhi9922y79763m0alvdmvm90i806qgb1a8l4fnimzx7l1n"; - type = "gem"; - }; - version = "0.10.13"; - }; asciidoctor = { groups = ["default"]; platforms = []; @@ -411,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; + sha256 = "0wvrz7d2rw17ihj2fmvaq91cg35pvk1asl4skncsk4w3mx7dlajp"; type = "gem"; }; - version = "3.181.1"; + version = "3.185.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; type = "gem"; }; - version = "1.134.0"; + version = "1.136.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -684,10 +673,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; + sha256 = "172v1vjqqlfk8dw3xh7j4m2wfmp74zwsh2v2jqppgzibmpcqjxxd"; type = "gem"; }; - version = "7.0.2"; + version = "7.1.1"; }; bundler-audit = { dependencies = ["thor"]; @@ -695,10 +684,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; + sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx"; type = "gem"; }; - version = "0.7.0.1"; + version = "0.9.1"; }; bundler-checksum = { dependencies = []; @@ -752,10 +741,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8k7bbwknqmq64mygl2a137vx3cs8xrjmdp8l3whm6f5vg480hg"; + sha256 = "089s8rbwddzcyw1ky34h90flz5wzqzi2lvajykbxn3l3s6mjsxw1"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; cbor = { groups = ["default"]; @@ -825,10 +814,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn"; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.0"; }; circuitbox = { groups = ["default"]; @@ -951,10 +940,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; cork = { dependencies = ["colored2"]; @@ -1083,6 +1072,16 @@ src: }; version = "8.0.0"; }; + dartsass = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i8kivfa4i1m2msw2h5zigxdnar5fvln7xhym85qyp35lmi74zi6"; + type = "gem"; + }; + version = "1.49.8"; + }; database_cleaner = { groups = ["development" "test"]; platforms = []; @@ -1192,10 +1191,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hglq61xxs8hgj2aq6g94w9ry90jq9aivb3c6fycxz1srdq26lsl"; + sha256 = "02p4cxz9w9nsghgmwmw32f9g80df8simagzpafhkvc5grdwwd8pv"; type = "gem"; }; - version = "0.0.22.pre.alpha1"; + version = "0.0.23.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1234,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35"; + sha256 = "15cbgb0hyq78myc6aaszzdrd9qll9n3qdhykmrx22qiyac3mnpy9"; type = "gem"; }; - version = "4.0.2"; + version = "4.1.1"; }; diff-lcs = { groups = ["default" "development" "test"]; @@ -1558,10 +1557,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5"; + sha256 = "029c7kynhkxw8fgq9q171xi68ajfqrb22r7drvkar018j8871yyz"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -1632,10 +1631,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + sha256 = "0f7isjr3vpvmyc3arqcgn1fc69axxd73xk87nk31ibpv15sfzvn8"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; factory_bot = { dependencies = ["activesupport"]; @@ -1804,17 +1803,6 @@ src: }; version = "0.3.0"; }; - faraday_middleware-multi_json = { - dependencies = ["faraday_middleware" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; - type = "gem"; - }; - version = "0.0.6"; - }; fast_blank = { groups = ["default"]; platforms = []; @@ -2131,10 +2119,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hsccw9njvvsic0qn5x1aia0yz66sy4bsw1pixc5jf2g990wrnam"; + sha256 = "0lw3lfq0wii1jg6112ry2c3g01dphwl8yp61xyh66ijds1d525zd"; type = "gem"; }; - version = "16.3.0.pre.rc1"; + version = "16.5.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2164,10 +2152,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04j81xsasbfzc9xs0sgizc76qj26ka629yrcd9l6m3iqj0byiaz3"; + sha256 = "15hax19xpav0i8mhg3y1zf4528hx18r6zg6dy8lwdk7s60gdi2wp"; type = "gem"; }; - version = "4.0.0"; + version = "4.3.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2191,6 +2179,16 @@ src: }; version = "1.8.0"; }; + gitlab-http = { + dependencies = ["activesupport" "httparty" "ipaddress" "nokogiri" "railties"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-http"; + type = "path"; + }; + version = "0.1.0"; + }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; @@ -2310,10 +2308,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19jba5gxlb25mvd85rn3hfzyzsqw4cq7ml13mzq1y0x94hbj1zf2"; + sha256 = "0vf1zw3z45m6ldwjvvzvbc6gr0spcbl1x1vny4qwid8msi26jxhd"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -2332,10 +2330,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nriqgy9rlnachzrq63xakskdgjg9b3bdgh2fb2b63kai8bbwc5h"; + sha256 = "0bk5lhaqfww0swi6xl1wqj6g97xmxlva6b8yyag23743k052x4qc"; type = "gem"; }; - version = "1.0.0"; + version = "1.3.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2583,10 +2581,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3"; + sha256 = "1jpjf9p3yf11f1fx74whp4zbxwcaf7jd5y10gknx61fr5z50791q"; type = "gem"; }; - version = "3.24.3"; + version = "3.24.4"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2735,10 +2733,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njsbxx82vqi8hdn4nad62abmh0x0w3mis3mq79q3xr11srisn23"; + sha256 = "0dlb8hbgs7yas59pwf4k7qrczbgkvrpcjqd2f5cmjj02fxdbwn8z"; type = "gem"; }; - version = "1.13.19"; + version = "2.0.27"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2746,21 +2744,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgb1r4vkyrq8hzhkii48hn7cdlkmnrswzjsl0xqxg1diz705bss"; + sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; graphql-docs = { - dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + dependencies = ["commonmarker" "dartsass" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmmifirvm4hay8qy6hjsdwms56sk973cq1b9c85b97xz0129f3y"; + sha256 = "1mq2zafz0n5yd0i251w1a37l3dk7dn2mhw5snzhjdnv3jaard0pn"; type = "gem"; }; - version = "2.1.0"; + version = "4.0.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -2768,10 +2766,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bk1l7mi98givcd4rj0h9izj97nwgff4lp7xi89mp3z9wpw354sj"; + sha256 = "00lx7sql179ak7rx5vg76z45y558d5wj0gldql4qjcaxjnzcryqc"; type = "gem"; }; - version = "1.55.0"; + version = "1.58.0"; }; gssapi = { dependencies = ["ffi"]; @@ -2859,16 +2857,6 @@ src: }; version = "1.3.7"; }; - hangouts-chat = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; - type = "gem"; - }; - version = "0.0.5"; - }; hashdiff = { groups = ["default" "test"]; platforms = []; @@ -3079,6 +3067,16 @@ src: }; version = "0.1.8"; }; + influxdb-client = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00lzkgzr6zmnlbqcfsb38b4d3762wslx0v32nsy6052jksvas7xm"; + type = "gem"; + }; + version = "2.9.0"; + }; invisible_captcha = { dependencies = ["rails"]; groups = ["default"]; @@ -3351,10 +3349,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112m3ypr3z3n23l0axy057wkbzwhf52p20pya2nylwd8jmck1gi2"; + sha256 = "02k7gr457gdi4zjgxr9ga44f8lb8q0yyiqmwhaylr70n76zqrmrp"; type = "gem"; }; - version = "1.4.7"; + version = "1.5.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -3465,14 +3463,14 @@ src: }; loofah = { dependencies = ["crass" "nokogiri"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c"; type = "gem"; }; - version = "2.21.3"; + version = "2.21.4"; }; lookbook = { dependencies = ["activemodel" "css_parser" "htmlbeautifier" "htmlentities" "marcel" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; @@ -3603,24 +3601,24 @@ src: }; mime-types = { dependencies = ["mime-types-data"]; - groups = ["danger" "default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { - groups = ["danger" "default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.1003"; }; mini_histogram = { groups = ["default" "test"]; @@ -4067,10 +4065,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ls87xxzhh1bbm4iqz221hz57y7iq1ifn33i7vvx1d02r9dl4k5i"; + sha256 = "0gh1d69w6p62hj18bh2p5fdykg9za1yifpq18swp9ms0pcx4yp4w"; type = "gem"; }; - version = "2.0.1"; + version = "3.0.0"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -4408,10 +4406,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; + sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; type = "gem"; }; - version = "3.2.2.3"; + version = "3.2.2.4"; }; parslet = { groups = ["default" "development" "test"]; @@ -4536,10 +4534,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yyd1mvzbv64jc700d2vvdcr4cmb2gwf68368g0bwp1ybn64xqgk"; + sha256 = "0ap52y7lng1cnqmg5bp4hazllppar33fpczwmh6gn9v9l64kkywj"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4601,10 +4599,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -4739,10 +4737,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4794,10 +4792,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4881,26 +4879,16 @@ src: }; version = "1.8.0"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; - type = "gem"; - }; - version = "6.3.2"; - }; re2 = { dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09c9f692ixym8sqk26f175jw53a00h2s4xad6z141axpi2mmy1q9"; + sha256 = "13xfrx1wwq7n2qsw449fq8h611n05v400i9dz9k6pdia019hp8q3"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.3"; }; recaptcha = { dependencies = ["json"]; @@ -5107,10 +5095,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; type = "gem"; }; - version = "6.2.0"; + version = "6.3.0"; }; rouge = { groups = ["default" "development" "test"]; @@ -5123,26 +5111,25 @@ src: version = "4.1.3"; }; rqrcode = { - dependencies = ["chunky_png"]; + dependencies = ["chunky_png" "rqrcode_core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "0.7.0"; + version = "2.2.0"; }; - rqrcode-rails3 = { - dependencies = ["rqrcode"]; + rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; + sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; type = "gem"; }; - version = "0.1.7"; + version = "1.2.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -5530,28 +5517,6 @@ src: }; version = "6.0.2"; }; - sass = { - dependencies = ["sass-listen"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; - type = "gem"; - }; - version = "3.5.5"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; sassc = { dependencies = ["ffi"]; groups = ["default"]; @@ -5612,10 +5577,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs"; + sha256 = "094x2gzfxpp4wzyy3fcbb5ah3abvdd41ilzwv5g0hgqx0a0nywjm"; type = "gem"; }; - version = "4.12.0"; + version = "4.14.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -6161,10 +6126,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08j5456rdpgxvv8bs44x81jrxzpxb79wxfxdq4fqwxyircxzi2jj"; + sha256 = "1mhzw33lv7h8d7pyh65lis5svnmm8m6fnszbsfg3j3xk9hcl0an5"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6192,10 +6157,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; thread_safe = { groups = ["default" "test"]; @@ -6517,10 +6482,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "0.12.1"; + version = "0.12.2"; }; uri_template = { groups = ["default"]; @@ -6602,10 +6567,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bz86m3bbnhy8j1gmpm76jcgqfyjafqwyxjdd1bk2f5jmgswvqy3"; + sha256 = "18s2b8g23agnykjjdw74ha0hhzx8n73gn41vsqxmhlgxnh8mr93s"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6719,10 +6684,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -6730,10 +6695,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default" "test"]; From 12cc4554fe6925efd7f10dacd5a4e0bc190a02af Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 23 Oct 2023 12:47:05 +0200 Subject: [PATCH 161/206] gitlab-container-registry: 3.84.0 -> 3.85.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v3.85.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 0cac9f890e78..6bc09d2e01b6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.84.0"; + version = "3.85.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE="; + sha256 = "sha256-F20f1qDsI+moBAL+Tpx5AALgOi0vTH7hZ5RIvRMwY1s="; }; - vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI="; + vendorHash = "sha256-JWuSJD2Mi0om9vA6+mYbArfr2lmGlRua6IM0DhDzSBk="; patches = [ ./Disable-inmemory-storage-driver-test.patch From 16d62f6ccd352a4ca9e6483a7d6989c668e5efa8 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 23 Oct 2023 11:52:28 +0000 Subject: [PATCH 162/206] gitlab: fix Puma low-level error handler location This replaces the hard-coded location to the Puma error handler class. https://gitlab.com/gitlab-org/gitlab/-/commit/80b76a16e06bebba149d4acdbe63cbbe0990a853#3ba20e58c18cc81aa8a5277f3be1d45ab5100691_88_84 --- pkgs/applications/version-management/gitlab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 559058824340..bc5d3aa8b33d 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -160,6 +160,7 @@ stdenv.mkDerivation { ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config + ${replace}/bin/replace-literal -f -r -e 'require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"' "require_relative '$out/share/gitlab/lib/gitlab/puma/error_handler'" config ''; buildPhase = '' From 8bf1b746fff50c9f45258b6d44aba9461bfd576f Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 24 Oct 2023 04:29:28 -0700 Subject: [PATCH 163/206] gitaly: exclude from r-ryantm gitaly needs to be updated in sync with the rest of the gitlab packages. --- pkgs/applications/version-management/gitlab/gitaly/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c74e88cce0fa..67a911c03d95 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,6 +13,7 @@ let commonOpts = { inherit version; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; From 221ba397376d05640cb8c0d3fd3714754c5ad227 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 24 Oct 2023 04:58:31 -0700 Subject: [PATCH 164/206] gitlab-container-registry: exclude from r-ryantm --- .../gitlab/gitlab-container-registry/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 6bc09d2e01b6..44fc1630c196 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -5,6 +5,7 @@ buildGoModule rec { version = "3.85.0"; rev = "v${version}-gitlab"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; From 379df76ed79db5e45798d3b6d75557fdf8806533 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 24 Oct 2023 04:58:51 -0700 Subject: [PATCH 165/206] gitlab-pages: exclude from r-ryantm --- .../version-management/gitlab/gitlab-pages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index f06c6d871add..a3f88ea6beee 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -4,6 +4,7 @@ buildGoModule rec { pname = "gitlab-pages"; version = "16.5.0"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; From 7015bc99ee1816acc964c10471210e07b06e06f5 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 24 Oct 2023 04:59:25 -0700 Subject: [PATCH 166/206] gitlab-shell: exclude from r-ryantm --- .../version-management/gitlab/gitlab-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 6dd006e029f8..882cb5f53844 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -3,6 +3,8 @@ buildGoModule rec { pname = "gitlab-shell"; version = "14.29.0"; + + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; From 05e5776b6f5b3f24adc4170d9335e370117a8def Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 24 Oct 2023 04:59:43 -0700 Subject: [PATCH 167/206] gitlab-workhorse: exclude from r-ryantm --- .../version-management/gitlab/gitlab-workhorse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 178aa0760245..9ce02008e7f0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -7,6 +7,7 @@ buildGoModule rec { version = "16.5.0"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = data.owner; repo = data.repo; From 922ea2cb71de5339c82694dca4b219e0602ed87c Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 31 Oct 2023 16:05:00 +0100 Subject: [PATCH 168/206] gitlab: 16.5.0 -> 16.5.1 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.5.1-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 5192a8742cdd..01773299cf1b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.5.0", - "repo_hash": "sha256-w4xlNTwRGjevBdOw+qjZR/eG8gZDTSv9dTsV15r6dkw=", - "yarn_hash": "18l908cw4j7isnal9mjz62v6p4ikh48bhgpgkgc7zz68zjvkawkj", + "version": "16.5.1", + "repo_hash": "sha256-7vKdCFDgtXSTlYV9nfLuQ+LZCaGDLU9zp97rob4dj2A=", + "yarn_hash": "1df7lf2grxpfjy1vgwsxw9n310jgjb64vqcxn2a7wzgh0svr1yyf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.5.0-ee", + "rev": "v16.5.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.5.0", - "GITLAB_PAGES_VERSION": "16.5.0", + "GITALY_SERVER_VERSION": "16.5.1", + "GITLAB_PAGES_VERSION": "16.5.1", "GITLAB_SHELL_VERSION": "14.29.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0", - "GITLAB_WORKHORSE_VERSION": "16.5.0" + "GITLAB_WORKHORSE_VERSION": "16.5.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 67a911c03d95..eddab0b53c9d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.5.0"; + version = "16.5.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3TMf9XKaTaIYg93wWXnsj+ckmMWzX/fbwUIFu3y2AwM="; + hash = "sha256-LrkFSsWIPqiEXUV5OyYkB2XUbCMXjbpcCmTacR33vOQ="; }; vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index a3f88ea6beee..72a12a81f3c2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.5.0"; + version = "16.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-4oeJHhArBlwz+DERznUAGrHQtq9Na/c2Sn5Jyx+xcLM="; + hash = "sha256-1fcsliorkl118MyUnZ3yrQjwLBQGsNBBA4dIEFHBJAI="; }; vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9ce02008e7f0..961d2d6dbd6c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.5.0"; + version = "16.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { From 3ffac817de384ed8252faae7cc15b738521920ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 3 Nov 2023 09:39:05 -0300 Subject: [PATCH 169/206] marwaita-peppermint: add update script --- pkgs/data/themes/marwaita-peppermint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index 6873cd31f8dd..3313d2dab928 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -5,6 +5,7 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; From 26401734aec1f37f4ddef622544b67d7a3d44ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 3 Nov 2023 09:43:16 -0300 Subject: [PATCH 170/206] marwaita-peppermint: 10.3 -> 17.0 --- pkgs/data/themes/marwaita-peppermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index 3313d2dab928..16a60de9287e 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "10.3"; + version = "17.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; + rev = "247f9c539d6eef8ae3a5f59beed42a40b1f10434"; + hash = "sha256-uT7KnpIdxypUqKhXOao3Bz3vJecJKK+GjcAp9biNyHc="; }; buildInputs = [ From fc20c6baa886e747bbeac1d5f35829fa735563e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 12:55:04 +0000 Subject: [PATCH 171/206] oauth2c: 1.12.0 -> 1.12.1 --- pkgs/tools/security/oauth2c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index b576bad13727..c4e187ea53ed 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-7WZJdB4D1UnveAgf8+aZlE/4+d0rUIPIYqG5k993nk4="; + hash = "sha256-Qb4eES7xT/bQTMtcpFy6aQ7n5U/0yA1GXdTR9ga3aYU="; }; - vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE="; + vendorHash = "sha256-+rkRo9zY3dRqElKApkbaBrDW8SqilqlGAhOM9vDeQps="; doCheck = false; # tests want to talk to oauth2c.us.authz.cloudentity.io From 4fd62d6259937deffebbbd092ce7fe7cbc99ab98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 14:11:21 +0100 Subject: [PATCH 172/206] python311Packages.yalexs-ble: 2.3.1 -> 2.3.2 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.3.1...v2.3.2 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.3.2/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 6c8624608764..29ac9d1c68d7 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.3.1"; + version = "2.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rWJojH2vitkoCRthaczWW/wGLdxsMlmJ4b/2vdaZhdA="; + hash = "sha256-uHkJEtaohuTRs1RXDPbe4dohbjBnYi9MFguP9CTwM5w="; }; nativeBuildInputs = [ From e6e4e2b6f3cbecb25ebf25a874dc5f86ba34f925 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 14:11:52 +0100 Subject: [PATCH 173/206] python311Packages.opower: 0.0.38 -> 0.0.39 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.0.38...v0.0.39 Changelog: https://github.com/tronikos/opower/releases/tag/v0.0.39 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 3a9b516c2daf..72e83c216699 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.38"; + version = "0.0.39"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-NX4w5id/XJfleHJd1fa1XcvekwhtWMaEyhbY253SMOo="; + hash = "sha256-5JcediHl2TeMhYa6OJqoW5K0SlAjdIrMwj2IHh3qW7I="; }; pythonRemoveDeps = [ From 025ea35c2b6880bda218b89262233de925bac18a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 09:08:16 +0200 Subject: [PATCH 174/206] python311Packages.holidays: add myself as maintainer --- pkgs/development/python-modules/holidays/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 976766f0a4df..94ba314a5300 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { homepage = "https://github.com/dr-prodigy/python-holidays"; changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; license = licenses.mit; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ fab jluttine ]; }; } From c3aa47061466cd306139e4fdef2f2d87d1ad073a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 14:20:20 +0100 Subject: [PATCH 175/206] python311Packages.holidays: 0.32 -> 0.35 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.35 --- .../python-modules/holidays/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 94ba314a5300..9fd25d7e138c 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -3,27 +3,33 @@ , convertdate , fetchFromGitHub , hijri-converter +, importlib-metadata , korean-lunar-calendar , polib , pytestCheckHook , python-dateutil , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "holidays"; - version = "0.32"; - format = "setuptools"; + version = "0.35"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dr-prodigy"; repo = "python-holidays"; - rev = "refs/tags/v.${version}"; - hash = "sha256-YAh5gR4KcUgXzeXy3xyGeokDFsyd9FqRQ5j1TC6wCQY="; + rev = "refs/tags/v${version}"; + hash = "sha256-FrAqVLyEtjhpiu1XdFY5yOstKKjXhRTv9PeaFlJaf8k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ convertdate python-dateutil @@ -32,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + importlib-metadata polib pytestCheckHook ]; @@ -48,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; - changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; + changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab jluttine ]; }; From d49f1017ed4f81411a7dd6af63b0f4a378369a48 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Fri, 3 Nov 2023 14:41:17 +0100 Subject: [PATCH 176/206] vesktop: 0.4.2 -> 0.4.3 --- pkgs/by-name/ve/vesktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 67f022e0e10b..2adef11a389a 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation rec { pname = "vesktop"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${version}"; - hash = "sha256-elgoX8z8q0+7uUia9gbcCmpDg+qYRWWUxdRuNV53Puw="; + hash = "sha256-wGOyDGY0FpAVS5+MTiKrOpDyd13ng0RLGAENW5tXuR4="; }; pnpm-deps = stdenvNoCC.mkDerivation { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; outputHash = { - "aarch64-linux" = "sha256-Fkfq8vBfNXdndVb17aZOTvIOAyiccDzyuFvg6kDy7QI="; - "x86_64-linux" = "sha256-KDJ8QmpwGb2lOdwWEl5y62pJiqEvpI59StfQZrN1PPE="; + "aarch64-linux" = "sha256-OcAQbUi+wpBAumncYxP3qtTzjyxiHL69kbQefwaeBfg="; + "x86_64-linux" = "sha256-R5/2MSH/jXHrj2x1Ap2OoOFLBLQp3Sq91o01uW8hWOw="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 778f31c1ad184b728b30505892437e2e11e54e88 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Fri, 3 Nov 2023 14:42:09 +0100 Subject: [PATCH 177/206] maintainers: add pluiedev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ec9ebd18811..2ddce3f70e30 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14088,6 +14088,12 @@ githubId = 7839004; name = "Dmitriy Pleshevskiy"; }; + pluiedev = { + email = "hi@pluie.me"; + github = "pluiedev"; + githubId = 22406910; + name = "Leah Amelia Chen"; + }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; From 76ddbdf9f0d5adce14d3db7aa3b1c6b2528f7029 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Fri, 3 Nov 2023 14:42:34 +0100 Subject: [PATCH 178/206] vesktop: add pluiedev as maintainer --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 2adef11a389a..0992f6612e98 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { description = "An alternate client for Discord with Vencord built-in"; homepage = "https://github.com/Vencord/Vesktop"; license = licenses.gpl3Only; - maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; + maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; }; From 1aab0ae6903e0b0c5dabc163aa01c53813bfc5db Mon Sep 17 00:00:00 2001 From: marte26 Date: Fri, 3 Nov 2023 02:30:12 +0100 Subject: [PATCH 179/206] stalwart-mail: 0.4.0 -> 0.4.2 Diff: https://github.com/stalwartlabs/mail-server/compare/v0.4.0...v0.4.2 Changelog: https://github.com/stalwartlabs/mail-server/blob/0.4.2/CHANGELOG --- pkgs/servers/mail/stalwart/Cargo.lock | 19 ++++++++++--------- pkgs/servers/mail/stalwart/default.nix | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/mail/stalwart/Cargo.lock b/pkgs/servers/mail/stalwart/Cargo.lock index c2d471f00054..80e61090a905 100644 --- a/pkgs/servers/mail/stalwart/Cargo.lock +++ b/pkgs/servers/mail/stalwart/Cargo.lock @@ -2276,7 +2276,7 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "imap" -version = "0.4.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "dashmap", @@ -2460,7 +2460,7 @@ dependencies = [ [[package]] name = "jmap" -version = "0.4.0" +version = "0.4.2" dependencies = [ "aes", "aes-gcm", @@ -2497,6 +2497,7 @@ dependencies = [ "sequoia-openpgp", "serde", "serde_json", + "sha1", "sha2 0.10.8", "sieve-rs", "smtp", @@ -2824,7 +2825,7 @@ dependencies = [ [[package]] name = "mail-server" -version = "0.4.0" +version = "0.4.2" dependencies = [ "directory", "imap", @@ -2841,7 +2842,7 @@ dependencies = [ [[package]] name = "managesieve" -version = "0.1.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "bincode", @@ -3031,7 +3032,7 @@ dependencies = [ [[package]] name = "nlp" -version = "0.4.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "bincode", @@ -4739,7 +4740,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smtp" -version = "0.4.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "blake3", @@ -5070,7 +5071,7 @@ dependencies = [ [[package]] name = "stalwart-cli" -version = "0.4.0" +version = "0.4.2" dependencies = [ "clap", "console", @@ -5092,7 +5093,7 @@ dependencies = [ [[package]] name = "stalwart-install" -version = "0.4.0" +version = "0.4.2" dependencies = [ "base64 0.21.4", "clap", @@ -5900,7 +5901,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.4.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "chrono", diff --git a/pkgs/servers/mail/stalwart/default.nix b/pkgs/servers/mail/stalwart/default.nix index f76d34cf29ee..2be1e000f88a 100644 --- a/pkgs/servers/mail/stalwart/default.nix +++ b/pkgs/servers/mail/stalwart/default.nix @@ -13,7 +13,7 @@ }: let - version = "0.4.0"; + version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-T61GlSzKdJZiSyRyxyk7PKhm0jmEtrMxoaTyM3FeDCU="; + hash = "sha256-Ah53htK38Bm2yGN44IiC6iRWgxkMVRtrNvXXvPh+SJc="; fetchSubmodules = true; }; From 1db183588e26cdf1c15c32bcc4e82a5f47492040 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 12:28:15 +0000 Subject: [PATCH 180/206] icewm: 3.4.3 -> 3.4.4 --- pkgs/by-name/ic/icewm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 4df2536516f3..186810876b32 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-SgSbcWNib2BXyTOBDI1J2TzXhnXoRH0GK3rJvyLID7w="; + hash = "sha256-bnoNkBsNJ/6CVmm5I/nwy6LGxYhxPXssjZ3TT7FdEz8="; }; nativeBuildInputs = [ From c9eed91c4bddcafbdcd776df729af1abac28ca3f Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 2 Nov 2023 22:25:21 +0000 Subject: [PATCH 181/206] =?UTF-8?q?vector:=200.33.0=20=E2=86=92=200.33.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/vector/Cargo.lock | 101 +++++++++++++---------------- pkgs/tools/misc/vector/default.nix | 4 +- 2 files changed, 47 insertions(+), 58 deletions(-) diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index e74b6b2c2107..c3e659723df5 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -655,7 +655,7 @@ dependencies = [ "once_cell", "rand 0.8.5", "regex", - "ring", + "ring 0.16.20", "rustls 0.21.7", "rustls-native-certs", "rustls-pemfile", @@ -808,7 +808,7 @@ dependencies = [ "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -5863,7 +5863,7 @@ dependencies = [ "num-bigint", "oauth2", "rand 0.8.5", - "ring", + "ring 0.16.20", "serde", "serde-value", "serde_derive", @@ -7280,11 +7280,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.4", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rkyv" version = "0.7.40" @@ -7500,7 +7514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -7512,7 +7526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -7544,8 +7558,8 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -7665,8 +7679,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -8812,27 +8826,15 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.18.0", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "rustls 0.21.7", "tokio", - "tungstenite 0.20.0", + "tungstenite", ] [[package]] @@ -9287,28 +9289,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes 1.5.0", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes 1.5.0", @@ -9496,6 +9479,12 @@ 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 = "uom" version = "0.31.1" @@ -9609,7 +9598,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.33.0" +version = "0.33.1" dependencies = [ "apache-avro", "approx", @@ -9772,7 +9761,7 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-tungstenite 0.20.0", + "tokio-tungstenite", "tokio-util", "toml 0.8.0", "tonic 0.10.1", @@ -9822,7 +9811,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite 0.20.0", + "tokio-tungstenite", "url", "uuid", ] @@ -10256,9 +10245,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" +checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" dependencies = [ "bytes 1.5.0", "futures-channel", @@ -10278,7 +10267,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite 0.18.0", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing 0.1.37", @@ -10404,12 +10393,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index c50d136d051e..911d7671ee59 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -34,7 +34,7 @@ let pname = "vector"; - version = "0.33.0"; + version = "0.33.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-ZhRvQQ0MxEd0Ry6sfEWUzYpEN80GhBOzpbEG5ZhCA2E="; + hash = "sha256-SjTXzLDxQ8tPSFirGCiUkgJbCHRRRK5Fr0CKgJ189Yc="; }; cargoLock = { From 3be8b8b7d3223366fead4bed2cc9781c143c18f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 14:51:40 +0100 Subject: [PATCH 182/206] python311Packages.aioairzone-cloud: 0.3.1 -> 0.3.2 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.3.1...0.3.2 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.3.2 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 2325bf4ff0fc..586f74c89c7a 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-PWdyyzdPXDOfZgyLasT9TW+g+So2wOkcf9Fy77Oydl4="; + hash = "sha256-aaa2/E6QCeWtTc1c7n0z05Kn3gCCjuQVbdwCgMAYX1A="; }; nativeBuildInputs = [ From 15ccb5d7c395f6525e183332c63f18f750283ad7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 14:17:54 +0000 Subject: [PATCH 183/206] pocketbase: 0.18.10 -> 0.19.2 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 552c51c4ce01..fb70c7747e41 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.18.10"; + version = "0.19.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-fbzoUmxWwQYEGrUIXtHP6Lz71C51TR30gz+5deB00LM="; + hash = "sha256-5VvjEFiZ7jnjqdagWeP2xrwDKtU9S6rQmsaupDFiK+c="; }; - vendorHash = "sha256-b0i+I/HzHbpmgclYn2g6MtpbslT/sLm9K2woMjvWaD0="; + vendorHash = "sha256-RGpB8f/1+eWZIAqb4OFUFlxhYRRm1WOh2edHp8KuGF4="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 7501546a2e23891e7946403724bd9b358ef6c2db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 15:22:56 +0100 Subject: [PATCH 184/206] python311Packages.python-crontab: disable failing test --- .../python-modules/python-crontab/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index 99cf1c63ca8f..a1fb349c9ee9 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -4,12 +4,13 @@ , python-dateutil , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-crontab"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil ]; @@ -30,6 +35,8 @@ buildPythonPackage rec { "test_07_non_posix_shell" # doctest that assumes /tmp is writeable, awkward to patch "test_03_usage" + # AssertionError: 4 != 0 + "test_19_frequency_at_month" ]; pythonImportsCheck = [ From 71a1739942b4bc19c6aa75fc12b83244face8e69 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Fri, 3 Nov 2023 12:20:12 +0100 Subject: [PATCH 185/206] asciinema: 2.3.0 -> 2.4.0 --- pkgs/tools/misc/asciinema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 667e13405607..2643cdd474b3 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "asciinema"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - hash = "sha256-1B2A2lfLeDHgD4tg3M5IIyHxBQ0cHuWDrQ3bUKAIFlc="; + hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI="; }; nativeBuildInputs = [ From cf583676b7add8fbc064065a0a14527ca5bcd9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Nov 2023 14:47:43 +0100 Subject: [PATCH 186/206] libdeltachat: 1.121.0 -> 1.128.0 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.121.0...v1.128.0 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.128.0/CHANGELOG.md --- .../libraries/libdeltachat/Cargo.lock | 1471 ++++++++--------- .../libraries/libdeltachat/default.nix | 8 +- 2 files changed, 689 insertions(+), 790 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 1e9b02504bd6..80f4eb3346f8 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -43,31 +43,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -89,9 +79,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-tzdata" @@ -125,15 +115,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -169,7 +159,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -197,15 +187,28 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] +[[package]] +name = "async-channel" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838" +dependencies = [ + "concurrent-queue", + "event-listener 3.0.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -221,12 +224,12 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" +checksum = "936c1b580be4373b48c9c687e0c79285441664398354df28d0860087cac0c069" dependencies = [ - "async-channel", - "base64 0.21.2", + "async-channel 1.9.0", + "base64 0.21.5", "bytes", "chrono", "futures", @@ -247,7 +250,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -281,13 +284,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.70" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -312,13 +315,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.2", + "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -364,9 +367,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -409,9 +412,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -442,22 +445,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "blake3" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", ] [[package]] @@ -499,9 +501,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -510,9 +512,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -520,9 +522,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -540,27 +542,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "camellia" @@ -574,18 +576,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -620,9 +622,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfb-mode" @@ -651,17 +656,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -703,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstyle", "clap_lex", @@ -722,9 +726,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -751,33 +755,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -786,9 +790,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -820,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -880,16 +884,6 @@ dependencies = [ "itertools", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -937,9 +931,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -957,16 +951,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -982,9 +966,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.3" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", @@ -1005,7 +989,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -1098,22 +1082,22 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows 0.32.0", + "windows", ] [[package]] name = "deltachat" -version = "1.121.0" +version = "1.128.0" dependencies = [ "ansi_term", "anyhow", - "async-channel", + "async-channel 2.0.0", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.2", + "base64 0.21.5", "brotli", "chrono", "criterion", @@ -1122,10 +1106,12 @@ dependencies = [ "encoded-words", "escaper", "fast-socks5", + "fd-lock", "format-flowed", "futures", "futures-lite", "hex", + "hickory-resolver", "humansize", "image", "iroh", @@ -1135,13 +1121,14 @@ dependencies = [ "log", "mailparse", "mime", - "num-derive 0.4.0", + "num-derive", "num-traits", "num_cpus", "once_cell", "parking_lot", "percent-encoding", "pgp", + "pin-project", "pretty_assertions", "pretty_env_logger", "proptest", @@ -1157,7 +1144,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "strum", "strum_macros", @@ -1172,19 +1159,18 @@ dependencies = [ "tokio-tar", "tokio-util", "toml", - "trust-dns-resolver", "url", "uuid", ] [[package]] name = "deltachat-jsonrpc" -version = "1.121.0" +version = "1.128.0" dependencies = [ "anyhow", - "async-channel", + "async-channel 2.0.0", "axum", - "base64 0.21.2", + "base64 0.21.5", "deltachat", "env_logger", "futures", @@ -1203,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.121.0" +version = "1.128.0" dependencies = [ "ansi_term", "anyhow", @@ -1218,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.121.0" +version = "1.128.0" dependencies = [ "anyhow", "deltachat", @@ -1238,12 +1224,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] name = "deltachat_ffi" -version = "1.121.0" +version = "1.128.0" dependencies = [ "anyhow", "deltachat", @@ -1273,9 +1259,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468 0.7.0", @@ -1308,6 +1294,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -1416,7 +1411,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1438,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -1466,9 +1461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "ecdsa" @@ -1484,13 +1479,13 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.7", + "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -1508,9 +1503,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", "signature 2.1.0", @@ -1533,22 +1528,22 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0-rc.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 4.0.0-rc.3", - "ed25519 2.2.1", + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "zeroize", ] [[package]] name = "educe" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1558,9 +1553,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1583,12 +1578,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.2", + "crypto-bigint 0.5.3", "digest 0.10.7", "ff 0.13.0", "generic-array", @@ -1597,7 +1592,7 @@ dependencies = [ "pem-rfc7468 0.7.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.2", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -1605,7 +1600,7 @@ dependencies = [ [[package]] name = "email" version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e" +source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9" dependencies = [ "base64 0.11.0", "chrono", @@ -1697,9 +1692,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1718,27 +1713,27 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -1756,29 +1751,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] @@ -1806,6 +1790,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.0", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1842,12 +1847,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -1856,8 +1858,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] @@ -1891,27 +1893,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.3.5", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2014,9 +2016,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "9c1155db57329dca6d018b61e76b1488ce9a2e5e44028cac420a5898f4fcef63" dependencies = [ "fastrand", "futures-core", @@ -2035,7 +2037,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -2115,9 +2117,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "group" @@ -2143,9 +2145,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2171,27 +2173,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2202,9 +2201,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2212,6 +2211,51 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.3" @@ -2236,7 +2280,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2280,15 +2324,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.1.5" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" +checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2" dependencies = [ "backtrace", "os_info", @@ -2330,7 +2374,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2352,16 +2396,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -2388,17 +2432,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -2411,9 +2444,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2446,12 +2479,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2463,53 +2496,32 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", + "windows-sys", + "winreg", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546" +source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" dependencies = [ "abao", "anyhow", - "base64 0.21.2", + "base64 0.21.5", "blake3", "bytes", "default-net", @@ -2526,8 +2538,9 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "ring", + "ring 0.16.20", "rustls", + "rustls-webpki", "serde", "serde-error", "ssh-key", @@ -2540,20 +2553,19 @@ dependencies = [ "tracing-futures", "tracing-subscriber", "walkdir", - "webpki", "x509-parser", "zeroize", ] [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] @@ -2567,9 +2579,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jpeg-decoder" @@ -2639,15 +2651,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -2669,21 +2681,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2691,9 +2697,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -2727,27 +2733,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -2759,9 +2760,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2796,13 +2797,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2898,14 +2899,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -2939,9 +2939,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2968,24 +2968,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -3022,9 +3011,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3042,9 +3031,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3078,11 +3067,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3099,7 +3088,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -3110,18 +3099,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "300.1.6+3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3147,15 +3136,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "overload" version = "0.1.1" @@ -3170,7 +3150,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3179,10 +3159,10 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3193,7 +3173,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3202,17 +3182,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3234,14 +3214,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pem" @@ -3278,12 +3258,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pgp" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" +checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" dependencies = [ "aes", - "base64 0.21.2", + "base64 0.21.5", "bitfield", "block-padding", "blowfish", @@ -3296,11 +3276,12 @@ dependencies = [ "chrono", "cipher", "crc24", + "curve25519-dalek 4.1.1", "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.0.0-rc.3", - "elliptic-curve 0.13.5", + "ed25519-dalek 2.0.0", + "elliptic-curve 0.13.6", "flate2", "generic-array", "hex", @@ -3309,15 +3290,15 @@ dependencies = [ "md-5", "nom", "num-bigint-dig", - "num-derive 0.3.3", + "num-derive", "num-traits", "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.0-pre.2", + "rsa 0.9.2", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "signature 2.1.0", "smallvec", @@ -3329,29 +3310,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3377,7 +3358,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.7", + "der 0.7.8", "pkcs8 0.10.2", "spki 0.7.2", ] @@ -3398,7 +3379,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.7", + "der 0.7.8", "spki 0.7.2", ] @@ -3410,9 +3391,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.0.2" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "plotters" @@ -3444,9 +3425,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3457,15 +3438,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postcard" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" dependencies = [ "cobs", "const_format", @@ -3484,6 +3465,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3492,13 +3479,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -3518,7 +3503,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", ] [[package]] @@ -3547,27 +3532,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "unarray", ] @@ -3579,11 +3563,12 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quic-rpc" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d" +checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7" dependencies = [ "bincode", + "educe", "flume", "futures", "pin-project", @@ -3603,18 +3588,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", @@ -3625,17 +3610,17 @@ dependencies = [ "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -3643,26 +3628,26 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.3.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2 0.4.9", + "socket2 0.5.5", "tracing", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3769,9 +3754,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3779,14 +3764,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3796,8 +3779,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.22", + "ring 0.16.20", + "time 0.3.30", "yasna", ] @@ -3832,13 +3815,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3850,6 +3834,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3858,17 +3853,23 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -3889,6 +3890,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -3896,7 +3898,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -3940,11 +3942,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -3977,9 +3993,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.0-pre.2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" dependencies = [ "byteorder", "const-oid", @@ -3992,6 +4008,7 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.1.0", + "spki 0.7.2", "subtle", "zeroize", ] @@ -4002,7 +4019,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4048,40 +4065,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" -dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ - "ring", + "ring 0.17.5", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4102,14 +4105,24 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" @@ -4117,7 +4130,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "cfg-if", "clipboard-win", "fd-lock", @@ -4136,9 +4149,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -4157,9 +4170,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" dependencies = [ "lazy_static", "regex", @@ -4171,14 +4184,14 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "dyn-clone", "schemars_derive", @@ -4188,9 +4201,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -4200,18 +4213,18 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4230,12 +4243,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.7", + "der 0.7.8", "generic-array", "pkcs8 0.10.2", "subtle", @@ -4244,9 +4257,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4257,9 +4270,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -4273,18 +4286,18 @@ checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -4300,22 +4313,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.10" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -4331,9 +4344,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4342,9 +4355,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ "itoa", "serde", @@ -4352,9 +4365,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -4384,9 +4397,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -4408,9 +4421,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4429,9 +4442,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -4467,36 +4480,36 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -4504,12 +4517,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4544,7 +4557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.7", + "der 0.7.8", ] [[package]] @@ -4555,7 +4568,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" dependencies = [ "base64ct", "pem-rfc7468 0.6.0", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4570,25 +4583,19 @@ dependencies = [ "rand_core 0.6.4", "rsa 0.7.2", "sec1 0.3.0", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "ssh-encoding", "zeroize", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stop-token" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cfg-if", "futures-core", "pin-project-lite", @@ -4614,15 +4621,15 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -4644,9 +4651,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4708,38 +4715,37 @@ dependencies = [ [[package]] name = "tagger" -version = "4.3.4" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" +checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.22", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "testdir" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7" +checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869" dependencies = [ "anyhow", "backtrace", @@ -4762,22 +4768,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -4803,11 +4809,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -4815,15 +4823,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -4855,11 +4863,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -4868,9 +4875,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.5", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4891,7 +4898,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] @@ -4947,9 +4954,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -4959,9 +4966,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4973,9 +4980,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -4985,20 +4992,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -5035,11 +5042,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5048,20 +5054,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -5079,12 +5085,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5106,51 +5112,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -5159,13 +5120,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", @@ -5187,15 +5148,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02" +checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5203,9 +5164,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864" +checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" dependencies = [ "darling 0.13.4", "ident_case", @@ -5229,19 +5190,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -5260,9 +5217,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5277,13 +5234,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.0" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] @@ -5301,9 +5264,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom 0.2.10", "serde", @@ -5329,15 +5292,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5391,7 +5354,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5425,7 +5388,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5446,16 +5409,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "weezl" version = "0.1.7" @@ -5496,9 +5449,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -5523,21 +5476,12 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.1", + "windows-targets", ] [[package]] @@ -5546,50 +5490,29 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5599,15 +5522,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5617,15 +5534,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5635,15 +5546,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5653,27 +5558,15 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5683,34 +5576,19 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winreg" version = "0.50.0" @@ -5718,17 +5596,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -5747,7 +5626,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -5771,17 +5650,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.30", ] [[package]] name = "yerpc" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96" +checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "async-mutex", "async-trait", "axum", @@ -5799,9 +5678,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" +checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe" dependencies = [ "convert_case 0.5.0", "darling 0.14.4", @@ -5810,6 +5689,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zerocopy" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -5827,5 +5726,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.38", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 395764d955ec..8d110da2b2f2 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.121.0"; + version = "1.128.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; + hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw="; }; patches = [ @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; + "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; + "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; - "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; }; }; From 3617ec51bc7f63099145dca125c0ed37c0375e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Nov 2023 14:49:05 +0100 Subject: [PATCH 187/206] deltachat-desktop: 1.40.4 -> unstable-2023-10-02 --- .../deltachat-desktop/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 6fae9b25fd52..8a92732f1e9a 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_22 +, electron_26 , buildGoModule , esbuild , fetchFromGitHub @@ -33,16 +33,15 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.40.4"; + version = "unstable-2023-11-02"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; - rev = "v${version}"; - hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU="; + rev = "2be9fccf54f24c9f4a2ab3db051d6adfea8bc9c1"; + hash = "sha256-OHpiHwVJb5pJIkehhDG8T52NoJOxENusf4Ns3sC7mZA="; }; - - npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0="; + npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc="; nativeBuildInputs = [ makeWrapper @@ -92,7 +91,7 @@ buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop From 60602f1d4b7f5bd03776c3bb3d105ccda7d198aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Nov 2023 15:09:12 +0100 Subject: [PATCH 188/206] deltachat-cursed: 0.7.2 -> 0.8.0 Diff: https://github.com/adbenitez/deltachat-cursed/compare/v0.7.2...v0.8.0 --- .../instant-messengers/deltachat-cursed/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index f1361fea1392..b803224e0f19 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk="; + hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY="; }; nativeBuildInputs = [ @@ -25,6 +25,8 @@ python3.pkgs.buildPythonApplication rec { emoji notify-py urwid-readline + setuptools + appdirs ]; doCheck = false; # no tests implemented From 5016616e6bdc347af514110c877cf3635c0020c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Nov 2023 10:00:56 +0100 Subject: [PATCH 189/206] libdeltachat: also install interactive repl --- pkgs/development/libraries/libdeltachat/default.nix | 13 +++++++++++++ .../python-modules/deltachat/default.nix | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 8d110da2b2f2..d66fa031e2e0 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -1,4 +1,5 @@ { lib +, rust , stdenv , fetchFromGitHub , cargo @@ -42,6 +43,18 @@ stdenv.mkDerivation rec { }; }; + outputs = [ "bin" "out" ]; + + preBuild = '' + cargo build \ + --target ${rust.envVars.rustHostPlatformSpec} \ + --release \ + -p deltachat-repl \ + --frozen \ + -j $NIX_BUILD_CORES \ + -Z unstable-options --out-dir $bin/bin/ + ''; + nativeBuildInputs = [ cmake perl diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 034be82d7e39..6e31227e6b33 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -56,8 +56,11 @@ buildPythonPackage rec { "deltachat.message" ]; - meta = libdeltachat.meta // { + meta = { description = "Python bindings for the Delta Chat Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; - }; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dotlambda srapenne ]; + platforms = lib.platforms.unix; +}; } From de9c794291cb05ad85ecf4b2fb7945056aeacc3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 15:25:35 +0000 Subject: [PATCH 190/206] podman: 4.7.0 -> 4.7.2 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index c1fdc2977a78..8841abcd3671 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.7.0"; + version = "4.7.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-xbU2F/QYtTKeZacTmwKDfIGuUg9VStEO/jkpChK0DyU="; + hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0="; }; patches = [ From 3de81b07243b53baa6c47c79c8be23f6a12d6e44 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 3 Nov 2023 14:44:31 +0100 Subject: [PATCH 191/206] tusc-sh: 1.1.0 -> 1.1.1 https://github.com/adhocore/tusc.sh/releases/tag/1.1.1 --- pkgs/by-name/tu/tusc-sh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tusc-sh/package.nix b/pkgs/by-name/tu/tusc-sh/package.nix index 387b68f85222..f5b1ce36e152 100644 --- a/pkgs/by-name/tu/tusc-sh/package.nix +++ b/pkgs/by-name/tu/tusc-sh/package.nix @@ -10,13 +10,13 @@ let tusc = stdenvNoCC.mkDerivation (finalAttrs: { pname = "tusc-sh"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "adhocore"; repo = "tusc.sh"; rev = finalAttrs.version; - hash = "sha256-9bTv6ih9N3nPtY5fioZvUCSvCHHB0+yVpxA++z8uGWY="; + hash = "sha256-EKlcE+rsVh5lUd8dQzAwXDjiUvrrud5yWfF6JWSZQFE="; }; dontConfigure = true; From 4e530c29c8b860ddff42df8800279870d9ae93be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Nov 2023 09:00:58 -0700 Subject: [PATCH 192/206] Revert "libdeltachat: also install interactive repl" This reverts commit 5016616e6bdc347af514110c877cf3635c0020c6. --- pkgs/development/libraries/libdeltachat/default.nix | 13 ------------- .../python-modules/deltachat/default.nix | 7 ++----- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index d66fa031e2e0..8d110da2b2f2 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -1,5 +1,4 @@ { lib -, rust , stdenv , fetchFromGitHub , cargo @@ -43,18 +42,6 @@ stdenv.mkDerivation rec { }; }; - outputs = [ "bin" "out" ]; - - preBuild = '' - cargo build \ - --target ${rust.envVars.rustHostPlatformSpec} \ - --release \ - -p deltachat-repl \ - --frozen \ - -j $NIX_BUILD_CORES \ - -Z unstable-options --out-dir $bin/bin/ - ''; - nativeBuildInputs = [ cmake perl diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 6e31227e6b33..034be82d7e39 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -56,11 +56,8 @@ buildPythonPackage rec { "deltachat.message" ]; - meta = { + meta = libdeltachat.meta // { description = "Python bindings for the Delta Chat Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dotlambda srapenne ]; - platforms = lib.platforms.unix; -}; + }; } From d9f13926adfd1a0bc1f5bf63c46282acfd5662f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Nov 2023 09:00:58 -0700 Subject: [PATCH 193/206] Revert "deltachat-cursed: 0.7.2 -> 0.8.0" This reverts commit 60602f1d4b7f5bd03776c3bb3d105ccda7d198aa. --- .../instant-messengers/deltachat-cursed/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index b803224e0f19..f1361fea1392 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.8.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY="; + hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk="; }; nativeBuildInputs = [ @@ -25,8 +25,6 @@ python3.pkgs.buildPythonApplication rec { emoji notify-py urwid-readline - setuptools - appdirs ]; doCheck = false; # no tests implemented From cae8343575a6a261f10e9b88f443932b55adcc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Nov 2023 09:00:58 -0700 Subject: [PATCH 194/206] Revert "deltachat-desktop: 1.40.4 -> unstable-2023-10-02" This reverts commit 3617ec51bc7f63099145dca125c0ed37c0375e16. --- .../deltachat-desktop/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 8a92732f1e9a..6fae9b25fd52 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_26 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -33,15 +33,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "unstable-2023-11-02"; + version = "1.40.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; - rev = "2be9fccf54f24c9f4a2ab3db051d6adfea8bc9c1"; - hash = "sha256-OHpiHwVJb5pJIkehhDG8T52NoJOxENusf4Ns3sC7mZA="; + rev = "v${version}"; + hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU="; }; - npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc="; + + npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0="; nativeBuildInputs = [ makeWrapper @@ -91,7 +92,7 @@ buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop From c5743b480abc513c6e4c6224eb43902783ca80ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Nov 2023 09:00:58 -0700 Subject: [PATCH 195/206] Revert "libdeltachat: 1.121.0 -> 1.128.0" This reverts commit cf583676b7add8fbc064065a0a14527ca5bcd9a6. --- .../libraries/libdeltachat/Cargo.lock | 1471 +++++++++-------- .../libraries/libdeltachat/default.nix | 8 +- 2 files changed, 790 insertions(+), 689 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 80f4eb3346f8..1e9b02504bd6 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -43,21 +43,31 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -79,9 +89,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" [[package]] name = "android-tzdata" @@ -115,15 +125,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" dependencies = [ "backtrace", ] @@ -159,7 +169,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.30", + "time 0.3.22", ] [[package]] @@ -187,28 +197,15 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener", "futures-core", ] -[[package]] -name = "async-channel" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838" -dependencies = [ - "concurrent-queue", - "event-listener 3.0.0", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - [[package]] name = "async-compression" version = "0.3.15" @@ -224,12 +221,12 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936c1b580be4373b48c9c687e0c79285441664398354df28d0860087cac0c069" +checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" dependencies = [ - "async-channel 1.9.0", - "base64 0.21.5", + "async-channel", + "base64 0.21.2", "bytes", "chrono", "futures", @@ -250,7 +247,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener 2.5.3", + "event-listener", ] [[package]] @@ -284,13 +281,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -315,13 +312,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", + "base64 0.21.2", "bitflags 1.3.2", "bytes", "futures-util", @@ -367,9 +364,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -412,9 +409,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -445,21 +442,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "blake3" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", + "digest 0.10.7", ] [[package]] @@ -501,9 +499,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "3.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -512,9 +510,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -522,9 +520,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "serde", @@ -542,27 +540,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" -version = "1.5.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "camellia" @@ -576,18 +574,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ "serde", ] @@ -622,12 +620,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfb-mode" @@ -656,16 +651,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", + "time 0.1.45", "wasm-bindgen", - "windows-targets", + "winapi", ] [[package]] @@ -707,18 +703,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" dependencies = [ "anstyle", "clap_lex", @@ -726,9 +722,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "clipboard-win" @@ -755,33 +751,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" dependencies = [ "proc-macro2", "quote", @@ -790,9 +786,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] name = "convert_case" @@ -824,9 +820,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -884,6 +880,16 @@ dependencies = [ "itertools", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -931,9 +937,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -951,6 +957,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -966,9 +982,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" dependencies = [ "cfg-if", "cpufeatures", @@ -989,7 +1005,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -1082,22 +1098,22 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows", + "windows 0.32.0", ] [[package]] name = "deltachat" -version = "1.128.0" +version = "1.121.0" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.0.0", + "async-channel", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.5", + "base64 0.21.2", "brotli", "chrono", "criterion", @@ -1106,12 +1122,10 @@ dependencies = [ "encoded-words", "escaper", "fast-socks5", - "fd-lock", "format-flowed", "futures", "futures-lite", "hex", - "hickory-resolver", "humansize", "image", "iroh", @@ -1121,14 +1135,13 @@ dependencies = [ "log", "mailparse", "mime", - "num-derive", + "num-derive 0.4.0", "num-traits", "num_cpus", "once_cell", "parking_lot", "percent-encoding", "pgp", - "pin-project", "pretty_assertions", "pretty_env_logger", "proptest", @@ -1144,7 +1157,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.8", + "sha2 0.10.7", "smallvec", "strum", "strum_macros", @@ -1159,18 +1172,19 @@ dependencies = [ "tokio-tar", "tokio-util", "toml", + "trust-dns-resolver", "url", "uuid", ] [[package]] name = "deltachat-jsonrpc" -version = "1.128.0" +version = "1.121.0" dependencies = [ "anyhow", - "async-channel 2.0.0", + "async-channel", "axum", - "base64 0.21.5", + "base64 0.21.2", "deltachat", "env_logger", "futures", @@ -1189,7 +1203,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.128.0" +version = "1.121.0" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1218,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.128.0" +version = "1.121.0" dependencies = [ "anyhow", "deltachat", @@ -1224,12 +1238,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] name = "deltachat_ffi" -version = "1.128.0" +version = "1.121.0" dependencies = [ "anyhow", "deltachat", @@ -1259,9 +1273,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" dependencies = [ "const-oid", "pem-rfc7468 0.7.0", @@ -1294,15 +1308,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - [[package]] name = "derive_builder" version = "0.12.0" @@ -1411,7 +1416,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1433,7 +1438,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -1461,9 +1466,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -1479,13 +1484,13 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" dependencies = [ - "der 0.7.8", + "der 0.7.7", "digest 0.10.7", - "elliptic-curve 0.13.6", + "elliptic-curve 0.13.5", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -1503,9 +1508,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.3" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" dependencies = [ "pkcs8 0.10.2", "signature 2.1.0", @@ -1528,22 +1533,22 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" dependencies = [ - "curve25519-dalek 4.1.1", - "ed25519 2.2.3", + "curve25519-dalek 4.0.0-rc.3", + "ed25519 2.2.1", "serde", - "sha2 0.10.8", + "sha2 0.10.7", "zeroize", ] [[package]] name = "educe" -version = "0.4.23" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" +checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1553,9 +1558,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -1578,12 +1583,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.3", + "crypto-bigint 0.5.2", "digest 0.10.7", "ff 0.13.0", "generic-array", @@ -1592,7 +1597,7 @@ dependencies = [ "pem-rfc7468 0.7.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.3", + "sec1 0.7.2", "subtle", "zeroize", ] @@ -1600,7 +1605,7 @@ dependencies = [ [[package]] name = "email" version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9" +source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e" dependencies = [ "base64 0.11.0", "chrono", @@ -1692,9 +1697,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1713,27 +1718,27 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", ] [[package]] name = "enum-ordinalize" -version = "3.1.15" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" +checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -1751,18 +1756,29 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", "libc", - "windows-sys", ] [[package]] @@ -1790,27 +1806,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" -dependencies = [ - "event-listener 3.0.0", - "pin-project-lite", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1847,9 +1842,12 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "fd-lock" @@ -1858,8 +1856,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix", - "windows-sys", + "rustix 0.38.2", + "windows-sys 0.48.0", ] [[package]] @@ -1893,27 +1891,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -2016,9 +2014,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "2.0.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1155db57329dca6d018b61e76b1488ce9a2e5e44028cac420a5898f4fcef63" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -2037,7 +2035,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -2117,9 +2115,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "group" @@ -2145,9 +2143,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -2173,24 +2171,27 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash", + "ahash 0.8.3", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.0", ] [[package]] @@ -2201,9 +2202,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2211,51 +2212,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hickory-proto" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "once_cell", - "rand 0.8.5", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "hkdf" version = "0.12.3" @@ -2280,7 +2236,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2324,15 +2280,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "human-panic" -version = "1.2.1" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2" +checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" dependencies = [ "backtrace", "os_info", @@ -2374,7 +2330,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -2396,16 +2352,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows 0.48.0", ] [[package]] @@ -2432,6 +2388,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.4.0" @@ -2444,9 +2411,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -2479,12 +2446,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.0", ] [[package]] @@ -2496,32 +2463,53 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2 0.5.3", "widestring", - "windows-sys", - "winreg", + "windows-sys 0.48.0", + "winreg 0.50.0", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "iroh" version = "0.4.1" -source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546" dependencies = [ "abao", "anyhow", - "base64 0.21.5", + "base64 0.21.2", "blake3", "bytes", "default-net", @@ -2538,9 +2526,8 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "ring 0.16.20", + "ring", "rustls", - "rustls-webpki", "serde", "serde-error", "ssh-key", @@ -2553,19 +2540,20 @@ dependencies = [ "tracing-futures", "tracing-subscriber", "walkdir", + "webpki", "x509-parser", "zeroize", ] [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi", - "rustix", - "windows-sys", + "rustix 0.38.2", + "windows-sys 0.48.0", ] [[package]] @@ -2579,9 +2567,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jpeg-decoder" @@ -2651,15 +2639,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" @@ -2681,15 +2669,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2697,9 +2691,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lru-cache" @@ -2733,22 +2727,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] -name = "matchit" -version = "0.7.3" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "md-5" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "cfg-if", "digest 0.10.7", ] @@ -2760,9 +2759,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.6.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -2797,13 +2796,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2899,13 +2898,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", + "static_assertions", ] [[package]] @@ -2939,9 +2939,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -2968,13 +2968,24 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", ] [[package]] @@ -3011,9 +3022,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -3031,9 +3042,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -3067,11 +3078,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -3088,7 +3099,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -3099,18 +3110,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", @@ -3136,6 +3147,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + [[package]] name = "overload" version = "0.1.1" @@ -3150,7 +3170,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -3159,10 +3179,10 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", "primeorder", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -3173,7 +3193,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -3182,17 +3202,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", "primeorder", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -3214,14 +3234,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pem" @@ -3258,12 +3278,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pgp" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" +checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" dependencies = [ "aes", - "base64 0.21.5", + "base64 0.21.2", "bitfield", "block-padding", "blowfish", @@ -3276,12 +3296,11 @@ dependencies = [ "chrono", "cipher", "crc24", - "curve25519-dalek 4.1.1", "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.0.0", - "elliptic-curve 0.13.6", + "ed25519-dalek 2.0.0-rc.3", + "elliptic-curve 0.13.5", "flate2", "generic-array", "hex", @@ -3290,15 +3309,15 @@ dependencies = [ "md-5", "nom", "num-bigint-dig", - "num-derive", + "num-derive 0.3.3", "num-traits", "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.2", + "rsa 0.9.0-pre.2", "sha1", - "sha2 0.10.8", + "sha2 0.10.7", "sha3", "signature 2.1.0", "smallvec", @@ -3310,29 +3329,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3358,7 +3377,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.8", + "der 0.7.7", "pkcs8 0.10.2", "spki 0.7.2", ] @@ -3379,7 +3398,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.7", "spki 0.7.2", ] @@ -3391,9 +3410,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.1.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "plotters" @@ -3425,9 +3444,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3438,15 +3457,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] name = "postcard" -version = "1.0.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" +checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" dependencies = [ "cobs", "const_format", @@ -3465,12 +3484,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3479,11 +3492,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ + "ctor", "diff", + "output_vt100", "yansi", ] @@ -3503,7 +3518,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ - "elliptic-curve 0.13.6", + "elliptic-curve 0.13.5", ] [[package]] @@ -3532,26 +3547,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.3.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", + "byteorder", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.6.29", "unarray", ] @@ -3563,12 +3579,11 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quic-rpc" -version = "0.6.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7" +checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d" dependencies = [ "bincode", - "educe", "flume", "futures", "pin-project", @@ -3588,18 +3603,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.10.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" dependencies = [ "bytes", "pin-project-lite", @@ -3610,17 +3625,17 @@ dependencies = [ "thiserror", "tokio", "tracing", + "webpki", ] [[package]] name = "quinn-proto" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +version = "0.9.2" +source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.16.20", + "ring", "rustc-hash", "rustls", "rustls-native-certs", @@ -3628,26 +3643,26 @@ dependencies = [ "thiserror", "tinyvec", "tracing", + "webpki", ] [[package]] name = "quinn-udp" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +version = "0.3.2" +source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" dependencies = [ - "bytes", "libc", - "socket2 0.5.5", + "quinn-proto", + "socket2 0.4.9", "tracing", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -3754,9 +3769,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -3764,12 +3779,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ + "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", + "num_cpus", ] [[package]] @@ -3779,8 +3796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring 0.16.20", - "time 0.3.30", + "ring", + "time 0.3.22", "yasna", ] @@ -3815,14 +3832,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-syntax 0.7.2", ] [[package]] @@ -3834,17 +3850,6 @@ dependencies = [ "regex-syntax 0.6.29", ] -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - [[package]] name = "regex-syntax" version = "0.6.29" @@ -3853,23 +3858,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.5", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -3890,7 +3889,6 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -3898,7 +3896,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -3942,25 +3940,11 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted 0.7.1", + "untrusted", "web-sys", "winapi", ] -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom 0.2.10", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys", -] - [[package]] name = "ripemd" version = "0.1.3" @@ -3993,9 +3977,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5" dependencies = [ "byteorder", "const-oid", @@ -4008,7 +3992,6 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.1.0", - "spki 0.7.2", "subtle", "zeroize", ] @@ -4019,7 +4002,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.3.3", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4065,26 +4048,40 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", "errno", "libc", - "linux-raw-sys", - "windows-sys", + "linux-raw-sys 0.4.3", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "ring 0.17.5", - "rustls-webpki", + "ring", "sct", + "webpki", ] [[package]] @@ -4105,24 +4102,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.5", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "rustyline" @@ -4130,7 +4117,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.3.3", "cfg-if", "clipboard-win", "fd-lock", @@ -4149,9 +4136,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "safemem" @@ -4170,9 +4157,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" dependencies = [ "lazy_static", "regex", @@ -4184,14 +4171,14 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "schemars_derive", @@ -4201,9 +4188,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", @@ -4213,18 +4200,18 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sct" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -4243,12 +4230,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.7", "generic-array", "pkcs8 0.10.2", "subtle", @@ -4257,9 +4244,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4270,9 +4257,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -4286,18 +4273,18 @@ checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.190" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] @@ -4313,22 +4300,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -4344,9 +4331,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -4355,9 +4342,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55" dependencies = [ "itoa", "serde", @@ -4365,9 +4352,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -4397,9 +4384,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -4421,9 +4408,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -4442,9 +4429,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.7" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -4480,36 +4467,36 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.11.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smawk" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "socket2" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -4517,12 +4504,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4557,7 +4544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.7", ] [[package]] @@ -4568,7 +4555,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" dependencies = [ "base64ct", "pem-rfc7468 0.6.0", - "sha2 0.10.8", + "sha2 0.10.7", ] [[package]] @@ -4583,19 +4570,25 @@ dependencies = [ "rand_core 0.6.4", "rsa 0.7.2", "sec1 0.3.0", - "sha2 0.10.8", + "sha2 0.10.7", "signature 1.6.4", "ssh-encoding", "zeroize", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stop-token" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel 1.9.0", + "async-channel", "cfg-if", "futures-core", "pin-project-lite", @@ -4621,15 +4614,15 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -4651,9 +4644,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -4715,37 +4708,38 @@ dependencies = [ [[package]] name = "tagger" -version = "4.3.5" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" +checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", - "windows-sys", + "rustix 0.37.22", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "testdir" -version = "0.8.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869" +checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7" dependencies = [ "anyhow", "backtrace", @@ -4768,22 +4762,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -4809,13 +4803,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" dependencies = [ - "deranged", "itoa", - "powerfmt", "serde", "time-core", "time-macros", @@ -4823,15 +4815,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -4863,10 +4855,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ + "autocfg", "backtrace", "bytes", "libc", @@ -4875,9 +4868,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.4.9", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4898,7 +4891,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] @@ -4954,9 +4947,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", @@ -4966,9 +4959,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4980,9 +4973,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -4992,20 +4985,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -5042,10 +5035,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5054,20 +5048,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -5085,12 +5079,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "lazy_static", "log", - "once_cell", "tracing-core", ] @@ -5112,6 +5106,51 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + [[package]] name = "try-lock" version = "0.2.4" @@ -5120,13 +5159,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ + "base64 0.13.1", "byteorder", "bytes", - "data-encoding", "http", "httparse", "log", @@ -5148,15 +5187,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typescript-type-def" -version = "0.5.8" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" +checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5164,9 +5203,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.8" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" +checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864" dependencies = [ "darling 0.13.4", "ident_case", @@ -5190,15 +5229,19 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-linebreak" -version = "0.1.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" +dependencies = [ + "hashbrown 0.12.3", + "regex", +] [[package]] name = "unicode-normalization" @@ -5217,9 +5260,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -5233,20 +5276,14 @@ 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 = "url" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] @@ -5264,9 +5301,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ "getrandom 0.2.10", "serde", @@ -5292,15 +5329,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", "winapi-util", @@ -5354,7 +5391,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", "wasm-bindgen-shared", ] @@ -5388,7 +5425,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5409,6 +5446,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "weezl" version = "0.1.7" @@ -5449,9 +5496,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi", ] @@ -5476,12 +5523,21 @@ dependencies = [ ] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.1", ] [[package]] @@ -5490,29 +5546,50 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.5", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -5522,9 +5599,15 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -5534,9 +5617,15 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -5546,9 +5635,15 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -5558,15 +5653,27 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -5576,19 +5683,34 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.5.17" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winreg" version = "0.50.0" @@ -5596,18 +5718,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 3.2.0", "rand_core 0.6.4", - "serde", "zeroize", ] @@ -5626,7 +5747,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.30", + "time 0.3.22", ] [[package]] @@ -5650,17 +5771,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.30", + "time 0.3.22", ] [[package]] name = "yerpc" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d" +checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96" dependencies = [ "anyhow", - "async-channel 1.9.0", + "async-channel", "async-mutex", "async-trait", "axum", @@ -5678,9 +5799,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe" +checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" dependencies = [ "convert_case 0.5.0", "darling 0.14.4", @@ -5689,26 +5810,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "zerocopy" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "zeroize" version = "1.6.0" @@ -5726,5 +5827,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.23", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 8d110da2b2f2..395764d955ec 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.128.0"; + version = "1.121.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw="; + hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; }; patches = [ @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; + "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; + "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; }; }; From f3cef779c6390b9bce642a0db95ccf07da807057 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 16:10:04 +0000 Subject: [PATCH 196/206] ecc: 1.0.11 -> 1.0.12 --- pkgs/by-name/ec/ecc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index 733e7a1f3cc4..b79fa4bd18c8 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -53,18 +53,18 @@ let in rustPlatform.buildRustPackage rec { pname = "ecc"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "eunomia-bpf"; repo = "eunomia-bpf"; rev = "v${version}"; - hash = "sha256-UiwS+osyC3gtbQH0bWNsx1p3xYr993/FAZ5d5NKnaBM="; + hash = "sha256-EK/SZ9LNAk88JpHJEoxw12NHje6QdCqO/vT2TfkWlb0="; }; sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-j2HPSmU/JARfw2mE1IiXFT/dcdxxnp+agC2DN0Kc5nw="; + cargoHash = "sha256-ymBEzFsMTxKSdJRYoDY3AC0QpgtcMlU0fQV03emCxQc="; nativeBuildInputs = [ pkg-config From f6fab894c3e763e863edae10f49b08458cd2a51f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 17:30:59 +0100 Subject: [PATCH 197/206] python311Packages.aiojobs: disable failing test --- .../python-modules/aiojobs/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 094e7509ee3c..1061b4f777a7 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -14,40 +14,50 @@ buildPythonPackage rec { version = "1.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiojobs"; rev = "refs/tags/v${version}"; hash = "sha256-/+PTHLrZyf2UuYkLWkNgzf9amFywDJnP2OKVWvARcAA="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=aiojobs/ --cov=tests/" "" + substituteInPlace pytest.ini \ + --replace "--cov=aiojobs/ --cov=tests/ --cov-report term" "" ''; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - aiohttp + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - __darwinAllowLocalNetworking = true; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + }; nativeCheckInputs = [ pytestCheckHook pytest-aiohttp - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; + disabledTests = [ + # RuntimeWarning: coroutine 'Scheduler._wait_failed' was never awaited + "test_scheduler_must_be_created_within_running_loop" + ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; From 60b3abeeeca00a4e2915389305168cde4e30c2fe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:05:42 +0100 Subject: [PATCH 198/206] aspino: drop gcc10StdenvCompat --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41b2e5493717..32d09e9d745f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39461,9 +39461,7 @@ with pkgs; alt-ergo = callPackage ../applications/science/logic/alt-ergo { }; - aspino = callPackage ../applications/science/logic/aspino { - stdenv = gcc10StdenvCompat; - }; + aspino = callPackage ../applications/science/logic/aspino { }; beluga = callPackage ../applications/science/logic/beluga { }; From b55d20d7c496c0a454b7a8bb46a3ba51c67b059c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Rapenne?= Date: Fri, 3 Nov 2023 17:52:06 +0100 Subject: [PATCH 199/206] treewide: remove myself as maintainer --- pkgs/applications/audio/musikcube/default.nix | 2 +- pkgs/applications/editors/kakoune/default.nix | 2 +- pkgs/applications/graphics/yacreader/default.nix | 2 +- pkgs/applications/misc/keepassxc/default.nix | 2 +- pkgs/applications/misc/minigalaxy/default.nix | 2 +- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 +- pkgs/applications/version-management/tig/default.nix | 2 +- pkgs/development/libraries/libdeltachat/default.nix | 2 +- pkgs/shells/fish/default.nix | 2 +- pkgs/tools/admin/aws-mfa/default.nix | 2 +- pkgs/tools/graphics/pngquant/default.nix | 2 +- pkgs/tools/misc/rlwrap/default.nix | 2 +- pkgs/tools/misc/tmux/default.nix | 2 +- pkgs/tools/networking/bwm-ng/default.nix | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 531d2851261b..f25606886ff7 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { description = "Terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; - maintainers = with lib.maintainers; [ aanderse srapenne afh ]; + maintainers = with lib.maintainers; [ aanderse afh ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 11ed70363993..5ca75e76cdf4 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra srapenne ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index f849512cae5f..b70fdfc9d74c 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -22,6 +22,6 @@ mkDerivation rec { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ srapenne ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index ef1baa1e853c..ed7884ad2562 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne blankparticle ]; + maintainers = with maintainers; [ jonafato blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 4dffe9e08eb6..ad694c01cdcb 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "A simple GOG client for Linux"; license = licenses.gpl3; - maintainers = with maintainers; [ srapenne ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index bc5b692501ac..2ae02236fe07 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -158,6 +158,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 srapenne ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; }; } diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index 188a0b115fdd..e4b54078edc5 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 srapenne ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 395764d955ec..7a395a9866d4 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; + maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index bd816f9a8991..1fa5b9c6151a 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -298,7 +298,7 @@ let homepage = "https://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ cole-h winter srapenne ]; + maintainers = with maintainers; [ cole-h winter ]; mainProgram = "fish"; }; diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/tools/admin/aws-mfa/default.nix index 666161f1d363..53b3a8d4a474 100644 --- a/pkgs/tools/admin/aws-mfa/default.nix +++ b/pkgs/tools/admin/aws-mfa/default.nix @@ -41,6 +41,6 @@ buildPythonApplication rec { description = "Manage AWS MFA Security Credentials"; homepage = "https://github.com/broamski/aws-mfa"; license = licenses.mit; - maintainers = [ maintainers.srapenne ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 9a33e4282b2f..73fa81ad6025 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = with licenses; [ gpl3Plus hpnd bsd2 ]; mainProgram = "pngquant"; - maintainers = [ maintainers.srapenne ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 34465b4e251e..ec0f90a5c46d 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanslub42/rlwrap"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ srapenne jlesquembre ]; + maintainers = with maintainers; [ jlesquembre ]; }; } diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 34707ce834d4..3cf6172891bd 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.unix; mainProgram = "tmux"; - maintainers = with lib.maintainers; [ thammers fpletz srapenne ]; + maintainers = with lib.maintainers; [ thammers fpletz ]; }; }) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 397fb30490a3..cfe0d4176a6f 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ srapenne ]; + maintainers = with maintainers; [ ]; longDescription = '' bwm-ng supports: - /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, From 9e8a009e7d218201be754e13365d4bde45537dd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 17:21:27 +0000 Subject: [PATCH 200/206] ghr: 0.16.1 -> 0.16.2 --- pkgs/applications/version-management/ghr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/applications/version-management/ghr/default.nix index a2abe04fea9a..7c786bb0b6b1 100644 --- a/pkgs/applications/version-management/ghr/default.nix +++ b/pkgs/applications/version-management/ghr/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ghr"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "sha256-swu+hj8fL/xIC3KdhGQ2Ezdt7aj9L8sU/7q/AXM2i98="; + sha256 = "sha256-xClqqTVCEGghaf63kN40mwo49lkS8KC4k/36NYIngFI="; }; vendorHash = "sha256-Wzzg66yJaHJUCfC2aH3Pk+B0d5l/+L7/bcNhQxo8ro0="; From a40dab0e6556b225dbe03f65f96a02e1062e5f8a Mon Sep 17 00:00:00 2001 From: "Janik H." Date: Fri, 3 Nov 2023 18:27:15 +0100 Subject: [PATCH 201/206] eslint_d: fix meta.homepage --- pkgs/development/tools/eslint_d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix index a49dbfdefc7a..e7e01bf8b5ae 100644 --- a/pkgs/development/tools/eslint_d/default.nix +++ b/pkgs/development/tools/eslint_d/default.nix @@ -17,7 +17,7 @@ buildNpmPackage rec { meta = with lib; { description = "Makes eslint the fastest linter on the planet"; - homepage = "github.com/mantoni/eslint_d.js"; + homepage = "https://github.com/mantoni/eslint_d.js"; license = licenses.mit; maintainers = [ maintainers.ehllie ]; mainProgram = "eslint_d"; From 89bd672b8576719119202d4bbd56f6313b18c338 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:43:06 +0100 Subject: [PATCH 202/206] python311Packages.symengine: fix build --- pkgs/development/python-modules/symengine/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 38ceda098209..599b2e74566b 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub , cython , cmake @@ -22,14 +21,6 @@ buildPythonPackage rec { hash = "sha256-03lHip0iExfptrUe5ObA6xXrsfS4QJPrh1Z0v7q2lDI="; }; - patches = [ - (fetchpatch { - # setuptools 61 compat - url = "https://github.com/symengine/symengine.py/commit/987e665e71cf92d1b021d7d573a1b9733408eecf.patch"; - hash = "sha256-2QbNdw/lKYRIRpOU5BiwF2kK+5Lh2j/Q82MKUIvl0+c="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \ From a4c808f542aa504950394ecb02de532760701934 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 3 Nov 2023 17:52:57 +0100 Subject: [PATCH 203/206] fg-virgil: init at 0.16.1 --- pkgs/data/fonts/fg-virgil/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/data/fonts/fg-virgil/default.nix diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/data/fonts/fg-virgil/default.nix new file mode 100644 index 000000000000..fdf83df42e03 --- /dev/null +++ b/pkgs/data/fonts/fg-virgil/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fg-virgil"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "excalidraw"; + repo = "excalidraw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-iziCCHacaShPqb0f5nI8cCinFFs5fB3TcMJrifNhg4I="; + }; + + installPhase = '' + runHook preInstall + + install -D -m 444 public/Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.ttf -t $out/share/fonts/ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/excalidraw/virgil"; + description = "The font that powers Excalidraw"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ drupol ]; + license = lib.licenses.ofl; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77a2a73ceec..d1f6c8f157bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29305,6 +29305,8 @@ with pkgs; ferrum = callPackage ../data/fonts/ferrum { }; + fg-virgil = callPackage ../data/fonts/fg-virgil { }; + fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { }; graphs = callPackage ../data/misc/graphs { }; From f60921aeede3ea43ea9c2cecf818934f1c6abbb9 Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:42:04 +0000 Subject: [PATCH 204/206] =?UTF-8?q?ocamlPackages.eio:=200.12=20=E2=86=92?= =?UTF-8?q?=200.13=20(#265029)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit But hold onto 0.12 for OCaml 5.0 https://github.com/ocaml-multicore/eio/releases/tag/v0.13 --- .../development/ocaml-modules/eio/default.nix | 22 ++++++++++++++----- pkgs/development/ocaml-modules/eio/linux.nix | 1 - pkgs/development/ocaml-modules/eio/main.nix | 1 - pkgs/development/ocaml-modules/eio/posix.nix | 1 - 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 1f9e18e887e0..005364039e02 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -1,4 +1,6 @@ { lib +, ocaml +, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.13" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -16,16 +18,26 @@ , mdx }: +let + param = { + "0.12" = { + minimalOCamlVersion = "5.0"; + hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; + }; + "0.13" = { + minimalOCamlVersion = "5.1"; + hash = "sha256-glN+4cWxgp/eggdhSk459WC9WCMyhBKQ7V73ZpHzr3A="; + }; + }."${version}"; +in buildDunePackage rec { pname = "eio"; - version = "0.12"; - - minimalOCamlVersion = "5.0"; - duneVersion = "3"; + inherit version; + inherit (param) minimalOCamlVersion; src = fetchurl { url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; + inherit (param) hash; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/eio/linux.nix b/pkgs/development/ocaml-modules/eio/linux.nix index 62f9800790b5..b376f709794a 100644 --- a/pkgs/development/ocaml-modules/eio/linux.nix +++ b/pkgs/development/ocaml-modules/eio/linux.nix @@ -10,7 +10,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix index def30f2a0597..410e53551275 100644 --- a/pkgs/development/ocaml-modules/eio/main.nix +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -11,7 +11,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix index 6c3042e65fae..e8dc4072bab1 100644 --- a/pkgs/development/ocaml-modules/eio/posix.nix +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -11,7 +11,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; From 4396643abec38492b53973b5601edd5c6d3e45c9 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 29 Oct 2023 20:17:06 +1100 Subject: [PATCH 205/206] talosctl: pin golang --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99bf72a34481..2f352a0c9749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35668,7 +35668,9 @@ with pkgs; taizen = callPackage ../applications/misc/taizen { }; - talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talosctl = callPackage ../applications/networking/cluster/talosctl { + buildGoModule = buildGo120Module; + }; talentedhack = callPackage ../applications/audio/talentedhack { }; From 3ce4c661512bb86209fbce9ffda0a356e86b4822 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 4 Nov 2023 01:02:27 +0300 Subject: [PATCH 206/206] nixos/module-list: add virt-manager Was missed in #261474 --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9a1bc0450d26..44acc011ba19 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -267,6 +267,7 @@ ./programs/udevil.nix ./programs/usbtop.nix ./programs/vim.nix + ./programs/virt-manager.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix ./programs/wayland/river.nix