From d99c367e1ecb1229b3c53bd65b66b07801e6288e Mon Sep 17 00:00:00 2001 From: Dilip Date: Wed, 17 Jul 2024 21:05:04 +0530 Subject: [PATCH 01/71] dra-cla: unstable-2024-02-07 -> 0-unstable-2024-06-07 --- pkgs/applications/video/dra-cla/default.nix | 44 +++++++++++++-------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/applications/video/dra-cla/default.nix index 02a4a66be929..452980565a08 100644 --- a/pkgs/applications/video/dra-cla/default.nix +++ b/pkgs/applications/video/dra-cla/default.nix @@ -1,26 +1,27 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, makeWrapper -, gnugrep -, gnused -, curl -, mpv -, aria2 -, ffmpeg -, fzf -, openssl +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + gnugrep, + gnused, + curl, + mpv, + aria2, + ffmpeg, + fzf, + openssl, }: stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2024-02-07"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "cf8a90c0c68338404e8a1434af0a6e65fc5d0a08"; - hash = "sha256-3cz1VeDM0NHdYMiCDVnIq6Y/7rFSijhNrnxC36Yixxc="; + rev = "24d7eaa5d433bc2cbbba4f23552cd812506fefee"; + hash = "sha256-BmBQSkLSq+BaxkzXEy3hlI3qNq2NCIoGKDKt7gyDz+s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +32,18 @@ stdenvNoCC.mkDerivation { install -Dm755 dra-cla $out/bin/dra-cla wrapProgram $out/bin/dra-cla \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg fzf openssl ]} + --prefix PATH : ${ + lib.makeBinPath [ + gnugrep + gnused + curl + mpv + aria2 + ffmpeg + fzf + openssl + ] + } runHook postInstall ''; From 8ed82c62be739f166c32512dc2b84e496f2d2855 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Mon, 23 Sep 2024 21:50:50 -0500 Subject: [PATCH 02/71] idris2Packages.pack: init at 2024-02-07 --- pkgs/development/compilers/idris2/default.nix | 2 + pkgs/development/compilers/idris2/pack.nix | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/compilers/idris2/pack.nix diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 8f628246c649..57031f673d3e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -4,5 +4,7 @@ idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; + pack = callPackage ./pack.nix { }; + buildIdris = callPackage ./build-idris.nix { }; } diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix new file mode 100644 index 000000000000..7e65a3f73a77 --- /dev/null +++ b/pkgs/development/compilers/idris2/pack.nix @@ -0,0 +1,55 @@ +{ + lib, + idris2Packages, + fetchFromGitHub, +}: +let + inherit (idris2Packages) idris2Api buildIdris; + toml = buildIdris { + ipkgName = "toml"; + version = "2022-05-05"; + src = fetchFromGitHub { + owner = "cuddlefishie"; + repo = "toml-idr"; + rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; + hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + }; + idrisLibraries = [ ]; + }; + filepath = buildIdris { + ipkgName = "filepath"; + version = "2023-12-04"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-filepath"; + rev = "eac02d51b631633f32330c788bcebeb24221fa09"; + hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + }; + idrisLibraries = [ ]; + }; + packPkg = buildIdris { + ipkgName = "pack"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-pack"; + rev = "305123401a28a57b02f750c589c35af628b2a5eb"; + hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + }; + idrisLibraries = [ + idris2Api + toml + filepath + ]; + + meta = { + description = "An Idris2 Package Manager with Curated Package Collections"; + mainProgram = "pack"; + homepage = "https://github.com/stefan-hoeck/idris2-pack"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2Packages.idris2.meta) platforms; + }; + }; +in +packPkg.executable From 723c4a673591de18ef1d7915881de9077ffca6de Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 8 Oct 2024 17:04:08 +0200 Subject: [PATCH 03/71] xlockmore: set mainprogram to xlock This allows using `nix run nixpkgs#xlockmore`. --- pkgs/misc/screensavers/xlockmore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index d99c9fd7fcff..beb45b31a837 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + mainProgram = "xlock"; }; } From 69ff55d18810ee2266f85a8995009c4ce36fa7b3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 12 Oct 2024 11:25:32 -0300 Subject: [PATCH 04/71] kid3: use regular callPackage instead of customized one Plus formatter. --- pkgs/applications/audio/kid3/default.nix | 134 ++++++++++++----------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 74 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 8cc6f6d8ec60..8403db5c9f3f 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,47 +1,44 @@ -{ chromaprint -, cmake -, docbook_xml_dtd_45 -, docbook_xsl -, fetchurl -, ffmpeg -, flac -, id3lib -, kdePackages -, lib -, libogg -, libvorbis -, libxslt -, mp4v2 -, pkg-config -, python3 -, qtbase -, qtdeclarative -, qtmultimedia -, qttools -, readline -, stdenv -, taglib -, wrapQtAppsHook -, zlib -, withCLI ? true -, withKDE ? true -, withQt ? false +{ + lib, + chromaprint, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + fetchurl, + ffmpeg, + flac, + id3lib, + kdePackages, + libogg, + libvorbis, + libxslt, + mp4v2, + pkg-config, + python3, + qt6, + readline, + stdenv, + taglib, + zlib, + # Boolean flags + withCLI ? true, + withKDE ? true, + withQt ? false, }: let - inherit (lib) optionals; + inherit (qt6) + qtbase + qtdeclarative + qtmultimedia + qttools + wrapQtAppsHook + ; apps = lib.concatStringsSep ";" ( - optionals withCLI [ "CLI" ] - ++ optionals withKDE [ "KDE" ] - ++ optionals withQt [ "Qt" ] + lib.optionals withCLI [ "CLI" ] ++ lib.optionals withKDE [ "KDE" ] ++ lib.optionals withQt [ "Qt" ] ); - mainProgram = - if withQt then "kid3-qt" - else if withKDE then "kid3" - else "kid3-cli"; - in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; @@ -62,29 +59,34 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - chromaprint - ffmpeg - flac - id3lib - libogg - libvorbis - libxslt - mp4v2 - qtbase - qtdeclarative - qtmultimedia - readline - taglib - zlib - ] ++ lib.optionals withKDE (with kdePackages; [ - kconfig - kconfigwidgets - kcoreaddons - kio - kxmlgui - phonon - ]); + buildInputs = + [ + chromaprint + ffmpeg + flac + id3lib + libogg + libvorbis + libxslt + mp4v2 + qtbase + qtdeclarative + qtmultimedia + readline + taglib + zlib + ] + ++ lib.optionals withKDE ( + with kdePackages; + [ + kconfig + kconfigwidgets + kcoreaddons + kio + kxmlgui + phonon + ] + ); cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; @@ -95,10 +97,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Simple and powerful audio tag editor"; - inherit mainProgram; homepage = "https://kid3.kde.org/"; - license = lib.licenses.lgpl2Plus; + description = "Simple and powerful audio tag editor"; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full @@ -128,6 +128,14 @@ stdenv.mkDerivation (finalAttrs: { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; + license = lib.licenses.lgpl2Plus; + mainProgram = + if withQt then + "kid3-qt" + else if withKDE then + "kid3" + else + "kid3-cli"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15df4f0cfde..6d139905f989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30397,9 +30397,9 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3-cli = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; - kid3-kde = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; - kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; + kid3-cli = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; + kid3-kde = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; + kid3-qt = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; kile = callPackage ../applications/editors/kile { }; From 9cdf75404de6f498fe5ecb84a71f01647d2a700b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 12 Oct 2024 11:28:04 -0300 Subject: [PATCH 05/71] kid3: migrate to by-name --- .../audio/kid3/default.nix => by-name/ki/kid3/package.nix} | 0 pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/kid3/default.nix => by-name/ki/kid3/package.nix} (100%) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/by-name/ki/kid3/package.nix similarity index 100% rename from pkgs/applications/audio/kid3/default.nix rename to pkgs/by-name/ki/kid3/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d139905f989..b9951f819511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30397,10 +30397,9 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3-cli = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; - kid3-kde = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; - kid3-qt = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; - kid3 = kid3-kde; + kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; }; + kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; }; + kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; }; kile = callPackage ../applications/editors/kile { }; From 17592f3f01ec3250ad735b8089483c534f688c7d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:05:52 -0300 Subject: [PATCH 06/71] vym: use standard callPackage --- pkgs/applications/misc/vym/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 8a550ac4a79f..b685a5e1d8af 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -3,15 +3,15 @@ , cmake , fetchFromGitHub , pkg-config -, qtbase -, qtscript -, qtsvg , substituteAll , unzip -, wrapQtAppsHook , zip +, qt5 }: +let + inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "vym"; version = "2.9.26"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15df4f0cfde..3e7e728dddbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33402,7 +33402,7 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = libsForQt5.callPackage ../applications/misc/vym { }; + vym = callPackage ../applications/misc/vym { }; wad = callPackage ../tools/security/wad { }; From 1236eb79b30e5789dd71f97c6739af876ab5ffd6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:12:03 -0300 Subject: [PATCH 07/71] vym: nixfmt-rfc-style and hammer - use lib.getExe - put patches on a dedicated directory --- pkgs/applications/misc/vym/default.nix | 50 ++++++++++++------- .../0000-fix-zip-paths.diff} | 0 2 files changed, 32 insertions(+), 18 deletions(-) rename pkgs/applications/misc/vym/{000-fix-zip-paths.diff => patches/0000-fix-zip-paths.diff} (100%) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index b685a5e1d8af..bafae7dad58e 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,16 +1,22 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, pkg-config -, substituteAll -, unzip -, zip -, qt5 +{ + lib, + cmake, + fetchFromGitHub, + pkg-config, + qt5, + stdenv, + substituteAll, + unzip, + zip, }: let - inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook; + inherit (qt5) + qtbase + qtscript + qtsvg + wrapQtAppsHook + ; in stdenv.mkDerivation (finalAttrs: { pname = "vym"; @@ -23,13 +29,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ (substituteAll { - src = ./000-fix-zip-paths.diff; - zipPath = "${zip}/bin/zip"; - unzipPath = "${unzip}/bin/unzip"; + src = ./patches/0000-fix-zip-paths.diff; + zipPath = "${lib.getExe zip}"; + unzipPath = "${lib.getExe unzip}"; }) ]; @@ -45,16 +54,20 @@ stdenv.mkDerivation (finalAttrs: { qtsvg ]; - strictDeps = true; - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + unzip + zip + ] + }" ]; + strictDeps = true; + meta = { homepage = "http://www.insilmaril.de/vym/"; description = "Mind-mapping software"; - mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. Such maps can help you to improve your creativity and @@ -67,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { work with such maps. ''; license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "vym"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/misc/vym/000-fix-zip-paths.diff b/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from pkgs/applications/misc/vym/000-fix-zip-paths.diff rename to pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff From fbd723ff804ed99058982559012a8ebcd637cda4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:40:24 -0300 Subject: [PATCH 08/71] vym: migrate to by-name --- .../misc/vym/default.nix => by-name/vy/vym/package.nix} | 0 .../misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc/vym/default.nix => by-name/vy/vym/package.nix} (100%) rename pkgs/{applications/misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff (100%) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/by-name/vy/vym/package.nix similarity index 100% rename from pkgs/applications/misc/vym/default.nix rename to pkgs/by-name/vy/vym/package.nix diff --git a/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff b/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff rename to pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7e728dddbd..94624ee12ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33402,8 +33402,6 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = callPackage ../applications/misc/vym { }; - wad = callPackage ../tools/security/wad { }; wafw00f = callPackage ../tools/security/wafw00f { }; From 01a9ca4f12856d786e70c9107dbd5836748fe377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 07:28:41 +0000 Subject: [PATCH 09/71] blueprint-compiler: 0.12.0 -> 0.14.0 --- pkgs/by-name/bl/blueprint-compiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index 95903e2e76d1..e426503c5487 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; + hash = "sha256-pkbTxCN7LagIbOtpiUCkh40aHw6uRtalQVFa47waXjU="; }; nativeBuildInputs = [ From b84f5e005bb677114328be7307280c8611373b46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 16:02:42 +0000 Subject: [PATCH 10/71] terranix: 2.7.0 -> 2.8.0 --- pkgs/applications/networking/cluster/terranix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index 4eb04c628646..e5b3222b9b0c 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM="; + sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA="; }; nativeBuildInputs = [ makeWrapper ]; From a444ff29796c5ff9bcfaa6d473ca347bf6342989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 05:01:54 +0000 Subject: [PATCH 11/71] python312Packages.dbt-semantic-interfaces: 0.6.2 -> 0.7.4 --- .../python-modules/dbt-semantic-interfaces/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 9eb306074a57..94d21ce3ecef 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.6.2"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs="; + hash = "sha256-LHcNitkrDQNz2971iMn13eELUyuJbjUK/u+u83JRIBk="; }; pythonRelaxDeps = [ "importlib-metadata" ]; From 53b37c99b41dbcbf9ddedc509f92776b055d08b4 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Mon, 14 Oct 2024 06:46:43 +0200 Subject: [PATCH 12/71] virtualbox: nixfmt --- .../virtualisation/virtualbox-guest.nix | 91 +++--- .../virtualisation/virtualbox-host.nix | 192 +++++++----- .../virtualization/virtualbox/default.nix | 287 ++++++++++++------ .../virtualization/virtualbox/extpack.nix | 18 +- .../guest-additions-iso/default.nix | 16 +- .../virtualbox/guest-additions/builder.nix | 152 ++++++---- .../virtualbox/guest-additions/default.nix | 209 ++++++++----- 7 files changed, 617 insertions(+), 348 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 31222d553a34..48eb4528a232 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -1,5 +1,10 @@ # Module for VirtualBox guests. -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.guest; kernel = config.boot.kernelPackages; @@ -28,7 +33,20 @@ let in { imports = [ - (lib.mkRenamedOptionModule [ "virtualisation" "virtualbox" "guest" "draganddrop" ] [ "virtualisation" "virtualbox" "guest" "dragAndDrop" ]) + (lib.mkRenamedOptionModule + [ + "virtualisation" + "virtualbox" + "guest" + "draganddrop" + ] + [ + "virtualisation" + "virtualbox" + "guest" + "dragAndDrop" + ] + ) ]; options.virtualisation.virtualbox.guest = { @@ -59,36 +77,38 @@ in ###### implementation - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - assertions = [{ - assertion = pkgs.stdenv.hostPlatform.isx86; - message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; - }]; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isx86; + message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; + } + ]; - environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; + environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; - boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; + boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; - boot.supportedFilesystems = [ "vboxsf" ]; - boot.initrd.supportedFilesystems = [ "vboxsf" ]; + boot.supportedFilesystems = [ "vboxsf" ]; + boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.groups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; - systemd.services.virtualbox = { - description = "VirtualBox Guest Services"; + systemd.services.virtualbox = { + description = "VirtualBox Guest Services"; - wantedBy = [ "multi-user.target" ]; - requires = [ "dev-vboxguest.device" ]; - after = [ "dev-vboxguest.device" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "dev-vboxguest.device" ]; + after = [ "dev-vboxguest.device" ]; - unitConfig.ConditionVirtualization = "oracle"; + unitConfig.ConditionVirtualization = "oracle"; - serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; - }; + serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; + }; - services.udev.extraRules = - '' + services.udev.extraRules = '' # /dev/vboxuser is necessary for VBoxClient to work. Maybe we # should restrict this to logged-in users. KERNEL=="vboxuser", OWNER="root", GROUP="root", MODE="0666" @@ -97,22 +117,17 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; - systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; - } - ( - lib.mkIf cfg.clipboard { + systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; + } + (lib.mkIf cfg.clipboard { systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard"; - } - ) - ( - lib.mkIf cfg.seamless { + }) + (lib.mkIf cfg.seamless { systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless"; - } - ) - ( - lib.mkIf cfg.dragAndDrop { + }) + (lib.mkIf cfg.dragAndDrop { systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop"; - } - ) - ]); + }) + ] + ); } diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 8820b4ff5a83..29e2d4340f3c 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -1,9 +1,19 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.host; virtualbox = cfg.package.override { - inherit (cfg) enableHardening headless enableWebService enableKvm; + inherit (cfg) + enableHardening + headless + enableWebService + enableKvm + ; extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; @@ -93,93 +103,119 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [{ - warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) - ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; - environment.systemPackages = [ virtualbox ]; - - security.wrappers = let - mkSuid = program: { - source = "${virtualbox}/libexec/virtualbox/${program}"; - owner = "root"; - group = "vboxusers"; - setuid = true; - }; - executables = [ - "VBoxHeadless" - "VBoxNetAdpCtl" - "VBoxNetDHCP" - "VBoxNetNAT" - "VBoxVolInfo" - ] ++ (lib.optionals (!cfg.headless) [ - "VBoxSDL" - "VirtualBoxVM" - ]); - in lib.mkIf cfg.enableHardening - (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables)); - - users.groups.vboxusers.gid = config.ids.gids.vboxusers; - - services.udev.extraRules = - '' - SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - ''; - } (lib.mkIf cfg.enableKvm { - assertions = [ + config = lib.mkIf cfg.enable ( + lib.mkMerge [ { - assertion = !cfg.addNetworkInterface; - message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) [ + "'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'" + ]; + environment.systemPackages = [ virtualbox ]; + + security.wrappers = + let + mkSuid = program: { + source = "${virtualbox}/libexec/virtualbox/${program}"; + owner = "root"; + group = "vboxusers"; + setuid = true; + }; + executables = + [ + "VBoxHeadless" + "VBoxNetAdpCtl" + "VBoxNetDHCP" + "VBoxNetNAT" + "VBoxVolInfo" + ] + ++ (lib.optionals (!cfg.headless) [ + "VBoxSDL" + "VirtualBoxVM" + ]); + in + lib.mkIf cfg.enableHardening ( + builtins.listToAttrs ( + map (x: { + name = x; + value = mkSuid x; + }) executables + ) + ); + + users.groups.vboxusers.gid = config.ids.gids.vboxusers; + + services.udev.extraRules = '' + SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + ''; } - ]; - }) (lib.mkIf (!cfg.enableKvm) { - boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ kernelModules ]; + (lib.mkIf cfg.enableKvm { + assertions = [ + { + assertion = !cfg.addNetworkInterface; + message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + } + ]; + }) + (lib.mkIf (!cfg.enableKvm) { + boot.kernelModules = [ + "vboxdrv" + "vboxnetadp" + "vboxnetflt" + ]; + boot.extraModulePackages = [ kernelModules ]; - services.udev.extraRules = - '' - KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" - KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - ''; + services.udev.extraRules = '' + KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" + KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + ''; - # Since we lack the right setuid/setcap binaries, set up a host-only network by default. - }) (lib.mkIf cfg.addNetworkInterface { - systemd.services.vboxnet0 = - { description = "VirtualBox vboxnet0 Interface"; - requires = [ "dev-vboxnetctl.device" ]; - after = [ "dev-vboxnetctl.device" ]; - wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ]; - path = [ virtualbox ]; - serviceConfig.RemainAfterExit = true; - serviceConfig.Type = "oneshot"; - serviceConfig.PrivateTmp = true; - environment.VBOX_USER_HOME = "/tmp"; - script = - '' + # Since we lack the right setuid/setcap binaries, set up a host-only network by default. + }) + (lib.mkIf cfg.addNetworkInterface { + systemd.services.vboxnet0 = { + description = "VirtualBox vboxnet0 Interface"; + requires = [ "dev-vboxnetctl.device" ]; + after = [ "dev-vboxnetctl.device" ]; + wantedBy = [ + "network.target" + "sys-subsystem-net-devices-vboxnet0.device" + ]; + path = [ virtualbox ]; + serviceConfig.RemainAfterExit = true; + serviceConfig.Type = "oneshot"; + serviceConfig.PrivateTmp = true; + environment.VBOX_USER_HOME = "/tmp"; + script = '' if ! [ -e /sys/class/net/vboxnet0 ]; then VBoxManage hostonlyif create cat /tmp/VBoxSVC.log >&2 fi ''; - postStop = - '' + postStop = '' VBoxManage hostonlyif remove vboxnet0 ''; - }; + }; - networking.interfaces.vboxnet0.ipv4.addresses = [{ address = "192.168.56.1"; prefixLength = 24; }]; - # Make sure NetworkManager won't assume this interface being up - # means we have internet access. - networking.networkmanager.unmanaged = ["vboxnet0"]; - }) (lib.mkIf config.networking.useNetworkd { - systemd.network.networks."40-vboxnet0".extraConfig = '' - [Link] - RequiredForOnline=no - ''; - }) + networking.interfaces.vboxnet0.ipv4.addresses = [ + { + address = "192.168.56.1"; + prefixLength = 24; + } + ]; + # Make sure NetworkManager won't assume this interface being up + # means we have internet access. + networking.networkmanager.unmanaged = [ "vboxnet0" ]; + }) + (lib.mkIf config.networking.useNetworkd { + systemd.network.networks."40-vboxnet0".extraConfig = '' + [Link] + RequiredForOnline=no + ''; + }) -]); + ] + ); } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 437ceba29ce0..13d254699fef 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,25 +1,74 @@ -{ config, stdenv, fetchurl, fetchpatch, callPackage, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook -, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU -, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras -, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz -, yasm, glslang -, nixosTests -# If open-watcom-bin is not passed, VirtualBox will fall back to use -# the shipped alternative sources (assembly). -, open-watcom-bin -, makeself, perl -, vulkan-loader -, javaBindings ? true, jdk # Almost doesn't affect closure size -, pythonBindings ? false, python3 -, extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio -, enableHardening ? false -, headless ? false -, enable32bitGuests ? true -, enableWebService ? false -, enableKvm ? false -, extraConfigureFlags ? "" +{ + config, + stdenv, + fetchurl, + fetchpatch, + callPackage, + lib, + acpica-tools, + dev86, + pam, + libxslt, + libxml2, + wrapQtAppsHook, + libX11, + xorgproto, + libXext, + libXcursor, + libXmu, + libIDL, + SDL2, + libcap, + libGL, + libGLU, + libpng, + glib, + lvm2, + libXrandr, + libXinerama, + libopus, + libtpms, + qtbase, + qtx11extras, + qttools, + qtsvg, + qtwayland, + pkg-config, + which, + docbook_xsl, + docbook_xml_dtd_43, + alsa-lib, + curl, + libvpx, + nettools, + dbus, + substituteAll, + gsoap, + zlib, + xz, + yasm, + glslang, + nixosTests, + # If open-watcom-bin is not passed, VirtualBox will fall back to use + # the shipped alternative sources (assembly). + open-watcom-bin, + makeself, + perl, + vulkan-loader, + javaBindings ? true, + jdk, # Almost doesn't affect closure size + pythonBindings ? false, + python3, + extensionPack ? null, + fakeroot, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + libpulseaudio, + enableHardening ? false, + headless ? false, + enable32bitGuests ? true, + enableWebService ? false, + enableKvm ? false, + extraConfigureFlags ? "", }: # The web services use Java infrastructure. @@ -41,12 +90,26 @@ let virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; - inherit (lib) optional optionals optionalString getDev getLib; -in stdenv.mkDerivation (finalAttrs: { + inherit (lib) + optional + optionals + optionalString + getDev + getLib + ; +in +stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; version = finalAttrs.virtualboxVersion; - inherit buildType virtualboxVersion virtualboxSha256 kvmPatchVersion kvmPatchHash virtualboxGuestAdditionsIso; + inherit + buildType + virtualboxVersion + virtualboxSha256 + kvmPatchVersion + kvmPatchHash + virtualboxGuestAdditionsIso + ; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; @@ -55,39 +118,84 @@ in stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ optional withModsrc "modsrc"; - nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ] - ++ optional (!headless) wrapQtAppsHook; + nativeBuildInputs = [ + pkg-config + which + docbook_xsl + docbook_xml_dtd_43 + yasm + glslang + ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = [ - acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libXrandr libpng libopus libtpms python3 xz ] + buildInputs = + [ + acpica-tools + dev86 + libxslt + libxml2 + xorgproto + libX11 + libXext + libXcursor + libIDL + libcap + glib + lvm2 + alsa-lib + curl + libvpx + pam + makeself + perl + libXmu + libXrandr + libpng + libopus + libtpms + python3 + xz + ] ++ optional javaBindings jdk ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals headless [ libGL ] - ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ] - ++ optionals enableWebService [ gsoap zlib ]; + ++ optionals (!headless) [ + qtbase + qtx11extras + libXinerama + SDL2 + libGLU + ] + ++ optionals enableWebService [ + gsoap + zlib + ]; - hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; + hardeningDisable = [ + "format" + "fortify" + "pic" + "stackprotector" + ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ - ${optionalString (!headless) '' - -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ - ''} -i configure + ${ + optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ + '' + } -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' - ${optionalString pulseSupport - ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' + ${optionalString pulseSupport ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' @@ -100,39 +208,41 @@ in stdenv.mkDerivation (finalAttrs: { ''; patches = - optional enableHardening ./hardened.patch - # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 - ++ optionals (!headless) [ ./fix-sdl.patch - # No update patch disables check for update function - # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 - (fetchpatch { - url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; - hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; - })] - ++ [ ./extra_symbols.patch ] - # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees - # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. - # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, - # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around - # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, - # after the code that unsets it. Note that qtsvg is included so that SVG icons from - # the user's icon theme can be loaded. - ++ optional (!headless && enableHardening) (substituteAll { + optional enableHardening ./hardened.patch + # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 + ++ optionals (!headless) [ + ./fix-sdl.patch + # No update patch disables check for update function + # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 + (fetchpatch { + url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; + hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; + }) + ] + ++ [ ./extra_symbols.patch ] + # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees + # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. + # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, + # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around + # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, + # after the code that unsets it. Note that qtsvg is included so that SVG icons from + # the user's icon theme can be loaded. + ++ optional (!headless && enableHardening) (substituteAll { src = ./qt-env-vars.patch; qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; - }) - # While the KVM patch should not break any other behavior if --with-kvm is not specified, - # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch { + }) + # While the KVM patch should not break any other behavior if --with-kvm is not specified, + # we don't take any chances and only apply it if people actually want to use KVM support. + ++ optional enableKvm (fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; hash = finalAttrs.kvmPatchHash; }) - ++ [ - ./qt-dependency-paths.patch - # https://github.com/NixOS/nixpkgs/issues/123851 - ./fix-audio-driver-loading.patch - ]; + ++ [ + ./qt-dependency-paths.patch + # https://github.com/NixOS/nixpkgs/issues/123851 + ./fix-audio-driver-loading.patch + ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -161,18 +271,18 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_WITH_UPDATE_AGENT := ${optionalString javaBindings '' - VBOX_JAVA_HOME := ${jdk} + VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' - VBOX_WITH_VBOXSDL := 1 - PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib - PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include - PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib - PATH_QT5_TOOLS_INC := ${getDev qttools}/include + VBOX_WITH_VBOXSDL := 1 + PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include + PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib + PATH_QT5_TOOLS_INC := ${getDev qttools}/include ''} ${optionalString enableWebService '' - # fix gsoap missing zlib include and produce errors with --as-needed - VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + # fix gsoap missing zlib include and produce errors with --as-needed + VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease LOCAL_CONFIG @@ -213,7 +323,9 @@ in stdenv.mkDerivation (finalAttrs: { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${ + optionalString (!headless) "VirtualBox VBoxSDL" + } ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -255,15 +367,16 @@ in stdenv.mkDerivation (finalAttrs: { ln -s "${finalAttrs.virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; - preFixup = optionalString (!headless) '' - wrapQtApp $out/bin/VirtualBox - '' - # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching - # the source code (see postPatch). - + optionalString (!headless && !enableHardening) '' - wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" - ''; + preFixup = + optionalString (!headless) '' + wrapQtApp $out/bin/VirtualBox + '' + # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching + # the source code (see postPatch). + + optionalString (!headless && !enableHardening) '' + wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" + ''; passthru = { inherit extensionPack; # for inclusion in profile to prevent gc @@ -285,7 +398,11 @@ in stdenv.mkDerivation (finalAttrs: { ]; license = lib.licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with lib.maintainers; [ sander friedrichaltheide blitz ]; + maintainers = with lib.maintainers; [ + sander + friedrichaltheide + blitz + ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 365c635a17ae..524077cd02fd 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox }: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; in @@ -9,14 +13,20 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; - in assert (builtins.stringLength value) == 64; value; + let + value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; + in + assert (builtins.stringLength value) == 64; + value; meta = with lib; { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander friedrichaltheide ]; + maintainers = with maintainers; [ + sander + friedrichaltheide + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index f59dcc25f4c2..9eda8a64da98 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox}: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; @@ -13,7 +17,13 @@ fetchurl { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ + lib.maintainers.sander + lib.maintainers.friedrichaltheide + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 00d0d555c60a..f2571d11fe15 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,14 +1,32 @@ -{ stdenv, kernel, fetchurl, lib, pam, libxslt -, libXext, libXcursor, libXmu -, glib, libXrandr, dbus, xz -, pkg-config, which, xorg -, yasm, patchelf, makeself -, linuxHeaders, openssl}: +{ + stdenv, + kernel, + fetchurl, + lib, + pam, + libxslt, + libXext, + libXcursor, + libXmu, + glib, + libXrandr, + dbus, + xz, + pkg-config, + which, + xorg, + yasm, + patchelf, + makeself, + linuxHeaders, + openssl, +}: let buildType = "release"; -in stdenv.mkDerivation (finalAttrs: { +in +stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; version = "7.0.20"; @@ -19,8 +37,26 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf pkg-config which yasm makeself xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies; - buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ]; + nativeBuildInputs = [ + patchelf + pkg-config + which + yasm + makeself + xorg.xorgserver + openssl + linuxHeaders + xz + ] ++ kernel.moduleBuildDependencies; + buildInputs = [ + dbus + libxslt + libXext + libXcursor + pam + libXmu + libXrandr + ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; @@ -58,61 +94,61 @@ in stdenv.mkDerivation (finalAttrs: { ''; configurePhase = '' - NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') + NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') - cat >> LocalConfig.kmk <> LocalConfig.kmk < Date: Thu, 17 Oct 2024 00:48:11 +0200 Subject: [PATCH 13/71] dbt: relax protobuf --- pkgs/development/python-modules/dbt-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 4388c972c4d6..79a535075457 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/core"; pythonRelaxDeps = [ + "protobuf" "agate" "click" "dbt-semantic-interfaces" From 9d0575a00263159b84e3cffae41ade98fcac7d70 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Oct 2024 00:48:11 +0200 Subject: [PATCH 14/71] python312Packages.dbt-adapters: relax protobuf --- pkgs/development/python-modules/dbt-adapters/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index 50a775edfa4e..ce94c14f45ed 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ hatchling ]; + pythonRelaxDeps = [ "protobuf" ]; + dependencies = [ agate dbt-common From dd9cebba8151d983b2638fde8f65f17eb9c110be Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Oct 2024 00:48:12 +0200 Subject: [PATCH 15/71] python312Packages.dbt-common: relax protobuf --- pkgs/development/python-modules/dbt-common/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 0bb43248db08..b97f071343e3 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -36,7 +36,10 @@ buildPythonPackage rec { build-system = [ hatchling ]; - pythonRelaxDeps = [ "agate" ]; + pythonRelaxDeps = [ + "protobuf" + "agate" + ]; dependencies = [ agate From 684df0290ea2e1f8e51670eb6190a26b0eb840b7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 16 Oct 2024 21:57:05 -0400 Subject: [PATCH 16/71] gpt4all: 3.3.0 -> 3.4.2 --- pkgs/by-name/gp/gpt4all/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 938b9166897f..125a3f4d46b7 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -3,6 +3,7 @@ , stdenv , fetchFromGitHub , fetchurl +, fetchpatch , cmake , qt6 , fmt @@ -16,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-aez/APsei30Tp1em/RDCuq+v8hOavHq4O9qZahrsF/g="; + hash = "sha256-QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -33,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./embedding-local.patch + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051"; + sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU="; + # remove the `gpt4all-chat` part of the paths as sourceRoot is gpt4all-chat + stripLen = 1; + }) ]; sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; @@ -70,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: { "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + "-DGGML_VULKAN=ON" + "-DGGML_KOMPUTE=ON" ] ++ lib.optionals (!cudaSupport) [ "-DLLMODEL_CUDA=OFF" ]; From e758ca25b37816a463c06c57dcd07c26a86a25f3 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:46:34 +0300 Subject: [PATCH 17/71] bear: 3.1.3 -> 3.1.5 Bump to 3.1.5 and switch from protobuf_25 to protobuf, since upstream 3.1.4 has a patch that fixed previously encountered build failures. Drop stale patch for functional tests that aren't run anyway. Next patches reenable tests. --- .../tools/build-managers/bear/default.nix | 13 +++----- .../bear/fix-functional-tests.patch | 32 ------------------- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bear/fix-functional-tests.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 489181187c4e..6595c143084f 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -6,7 +6,7 @@ ninja, pkg-config, grpc, - protobuf_25, + protobuf, openssl, nlohmann_json, gtest, @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; + hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ grpc - protobuf_25 + protobuf openssl nlohmann_json gtest @@ -63,11 +63,6 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ENABLE_FUNC_TESTS" false) ]; - patches = [ - # Fix toolchain environment variable handling and the Darwin SIP check. - ./fix-functional-tests.patch - ]; - postPatch = '' patchShebangs test/bin diff --git a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch deleted file mode 100644 index 99d64f26d077..000000000000 --- a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/test/lit.cfg b/test/lit.cfg -index 118c979..b69fecc 100644 ---- a/test/lit.cfg -+++ b/test/lit.cfg -@@ -207,13 +207,8 @@ def is_preload_disabled(): - if is_windows: - return True - elif sys.platform == 'darwin': -- command = ['csrutil', 'status'] -- pattern = re.compile(r'System Integrity Protection status:\s+enabled') -- try: -- output = subprocess.check_output(command, stderr=subprocess.STDOUT) -- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) -- except (OSError, subprocess.CalledProcessError): -- return False -+ # csrutil(8) isn't available in the Nix build sandbox. -+ return True - else: - return False - -@@ -221,6 +216,11 @@ def is_preload_disabled(): - if not is_preload_disabled(): - config.available_features.add('preload') - -+# Preserve the variables required for the Nix toolchain wrappers. -+for var, value in os.environ.items(): -+ if var.startswith('NIX_'): -+ config.environment[var] = value -+ - print(config.substitutions) - print(config.environment) - print(config.available_features) From 43da99888c0d82825b868e5091467f0d7a286f8a Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:35:45 +0300 Subject: [PATCH 18/71] bear: re-enable tests Apply patch to run unit/lit tests in checkPhase instead of buildPhase. Move test dependencies to nativeCheckInputs/checkInputs. Use finalAttrs to make doCheck overridable. Disable failings tests from lit test suite. --- .../bear/0001-exclude-tests-from-all.patch | 25 +++++++++ .../tools/build-managers/bear/default.nix | 54 +++++++++++++++---- 2 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch diff --git a/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch b/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch new file mode 100644 index 000000000000..041ab7246eed --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1ecfe0..9056f9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,8 +83,9 @@ ExternalProject_Add(BearSource + -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS} + -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} + ${CMAKE_CACHE_ARGS_EXTRA} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN + 1 ++ STEP_TARGETS test + TEST_COMMAND + ctest # or `ctest -T memcheck` + ) +@@ -100,7 +101,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN ++ STEP_TARGETS test + 1 + INSTALL_COMMAND + "" diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6595c143084f..01d7560b9302 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -20,14 +20,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bear"; version = "3.1.5"; src = fetchFromGitHub { owner = "rizsotto"; - repo = pname; - rev = version; + repo = "bear"; + rev = finalAttrs.version; hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - - # Used for functional tests, which run during buildPhase. - lit - python3 ]; buildInputs = [ @@ -46,7 +42,6 @@ stdenv.mkDerivation rec { protobuf openssl nlohmann_json - gtest spdlog c-ares zlib @@ -54,15 +49,52 @@ stdenv.mkDerivation rec { re2 ]; + patches = [ + # This patch is necessary to run tests in a separate phase. By default + # test targets are run with ALL, which is not what we want. This patch creates + # separate 'test' step targets for each cmake ExternalProject: + # - BearTest-test (functional lit tests) + # - BearSource-test (unit tests via gtest) + ./0001-exclude-tests-from-all.patch + ]; + + nativeCheckInputs = [ + lit + python3 + ]; + + checkInputs = [ + gtest + ]; + cmakeFlags = [ # Build system and generated files concatenate install prefix and # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" - (lib.cmakeBool "ENABLE_UNIT_TESTS" false) - (lib.cmakeBool "ENABLE_FUNC_TESTS" false) + (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.doCheck) ]; + checkTarget = lib.concatStringsSep " " [ + "BearTest-test" + "BearSource-test" + ]; + + doCheck = true; + + env = { + # Disable failing tests. The cause is not immediately clear. + LIT_FILTER_OUT = lib.concatStringsSep "|" [ + "cases/compilation/output/config/filter_compilers.sh" + "cases/intercept/preload/posix/execvpe/success_to_resolve.c" + "cases/intercept/preload/posix/popen/success.c" + "cases/intercept/preload/posix/posix_spawnp/success_to_resolve.c" + "cases/intercept/preload/posix/system/success.c" + "cases/intercept/preload/shell_commands_intercepted_without_shebang.sh" + ]; + }; + postPatch = '' patchShebangs test/bin @@ -87,4 +119,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ DieracDelta ]; }; -} +}) From 7281ff8a09af2cc30b8c648c8dff843934026812 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:59:48 +0300 Subject: [PATCH 19/71] bear: move to pkgs/by-name --- .../be}/bear/0001-exclude-tests-from-all.patch | 0 .../bear/default.nix => by-name/be/bear/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/build-managers => by-name/be}/bear/0001-exclude-tests-from-all.patch (100%) rename pkgs/{development/tools/build-managers/bear/default.nix => by-name/be/bear/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch b/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch similarity index 100% rename from pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch rename to pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/by-name/be/bear/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bear/default.nix rename to pkgs/by-name/be/bear/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5e6adaedd9d..de335d5cd018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17027,8 +17027,6 @@ with pkgs; buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; - bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { From 1f08575e3aed1e7adb0a24c47d9919c10cae01d7 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 9 Jan 2024 23:50:13 +0000 Subject: [PATCH 20/71] nixos/sshd: Disable `authorizedKeysInHomedir` if `stateVersion` >= 24.11 Co-authored-by: Valentin Gagarin --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/modules/services/networking/ssh/sshd.nix | 3 ++- nixos/tests/openssh.nix | 11 +++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1b0c29f3809f..dbcfecac6922 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -390,6 +390,9 @@ * from `/var/log/private/gns3` to `/var/log/gns3` and to change the ownership of these directories and their contents to `gns3` (including `/etc/gns3`). +- The `sshd` module now doesn't include `%h/.ssh/authorized_keys` as `AuthorizedKeysFile` unless + `services.openssh.authorizedKeysInHomedir` is set to `true` (the default is `false` for `stateVersion` 24.11 onwards). + - Legacy package `stalwart-mail_0_6` was dropped, please note the [manual upgrade process](https://github.com/stalwartlabs/mail-server/blob/main/UPGRADING.md) before changing the package to `pkgs.stalwart-mail` in diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 26ca39f73d39..b968da777a44 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -302,7 +302,8 @@ in authorizedKeysInHomedir = lib.mkOption { type = lib.types.bool; - default = true; + default = lib.versionOlder config.system.stateVersion "24.11"; + defaultText = lib.literalMD "`false` unless [](#opt-system.stateVersion) is 24.05 or older"; description = '' Enables the use of the `~/.ssh/authorized_keys` file. diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index d420c482ca7f..b4aacd60c81b 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -14,7 +14,10 @@ in { { ... }: { - services.openssh.enable = true; + services.openssh = { + enable = true; + authorizedKeysInHomedir = true; + }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; users.users.root.openssh.authorizedKeys.keys = [ @@ -39,7 +42,11 @@ in { { ... }: { - services.openssh = { enable = true; startWhenNeeded = true; }; + services.openssh = { + enable = true; + startWhenNeeded = true; + authorizedKeysInHomedir = true; + }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; users.users.root.openssh.authorizedKeys.keys = [ From 6c62fbf53937270614ea6937af551ad2c6fe293b Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Sep 2024 16:46:24 +0000 Subject: [PATCH 21/71] nixos/sshd: warn if no authorized keys, and no authentication method other than pubkeys, were configured --- nixos/modules/services/networking/ssh/sshd.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b968da777a44..c90164b21ccb 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -108,6 +108,10 @@ let }; + usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u: + lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0 + )); + authKeysFiles = let mkAuthKeyFile = u: lib.nameValuePair "ssh/authorized_keys.d/${u.name}" { mode = "0444"; @@ -116,9 +120,6 @@ let ${lib.concatMapStrings (f: lib.readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u: - lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0 - )); in lib.listToAttrs (map mkAuthKeyFile usersWithKeys); authPrincipalsFiles = let @@ -545,6 +546,17 @@ in config = lib.mkIf cfg.enable { + warnings = lib.optional (with cfg; lib.all lib.id [ + # ~/.ssh/authorized_keys is ignored and no custom file locations were set + (authorizedKeysFiles == [ "/etc/ssh/authorized_keys.d/%u" ]) + # no command provides authorized keys + (authorizedKeysCommand == "none") + # no users have keys in declarative configuration + (usersWithKeys == []) + # no authentication methods other than public keys are configured + ((settings.PasswordAuthentication == false && !package.withKerberos) || settings.AuthenticationMethods == [ "publickey" ]) + ]) "services.openssh: no keys were set in `users.users.*.openssh.authorizedKeys` and `~/.ssh/authorized_keys` will be ignored"; + users.users.sshd = { isSystemUser = true; From 8de11b252d4a0239d7bbbf4eba74754b508119ce Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:45:14 +0300 Subject: [PATCH 22/71] tests.cc-wrapper: Run CC CXX with an empty path Ensure our wrappers hardcode all the necessary tools --- pkgs/test/cc-wrapper/default.nix | 49 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 3de359d15b4a..9e25be460e25 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -11,6 +11,9 @@ let emulator = stdenv.hostPlatform.emulator buildPackages; isCxx = stdenv.cc.libcxx != null; libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; + CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}"; + CXX = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}c++"}"; + READELF = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}readelf"}"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -20,38 +23,38 @@ in stdenv.mkDerivation { echo "With libc: ${stdenv.cc.libc.name}" >&2 set -o pipefail - NIX_DEBUG=1 $CC -v - NIX_DEBUG=1 $CXX -v + NIX_DEBUG=1 ${CC} -v + NIX_DEBUG=1 ${CXX} -v echo "checking whether compiler builds valid C binaries... " >&2 - $CC -o cc-check ${./cc-main.c} + ${CC} -o cc-check ${./cc-main.c} ${emulator} ./cc-check echo "checking whether compiler builds valid C++ binaries... " >&2 - $CXX -o cxx-check ${./cxx-main.cc} + ${CXX} -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found # in libcxxStdenv echo "checking whether cxxabi.h can be included... " >&2 - $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${CXX} -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi # cxx doesn't have libatomic.so ${lib.optionalString (!isCxx) '' # https://github.com/NixOS/nixpkgs/issues/91285 echo "checking whether libatomic.so can be linked... " >&2 - $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} - $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 + ${CXX} -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + ${READELF} -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 ''} # Test that linking libc++ works, and statically. ${lib.optionalString isCxx '' echo "checking whether can link with libc++... " >&2 - NIX_DEBUG=1 $CXX ${./cxx-main.cc} -c -o cxx-main.o - NIX_DEBUG=1 $CC cxx-main.o -lc++ -o cxx-main - NIX_DEBUG=1 $CC cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static + NIX_DEBUG=1 ${CXX} ${./cxx-main.cc} -c -o cxx-main.o + NIX_DEBUG=1 ${CC} cxx-main.o -lc++ -o cxx-main + NIX_DEBUG=1 ${CC} cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static ${emulator} ./cxx-main ${emulator} ./cxx-main-static rm cxx-main{,-static,.o} @@ -60,18 +63,18 @@ in stdenv.mkDerivation { ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib - $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} + ${CC} -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} ${emulator} ./core-foundation-check ''} ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ${CC} ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' echo "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ${CC} ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ${emulator} ./cc-static-pie ''} ''} @@ -84,47 +87,47 @@ in stdenv.mkDerivation { # Make sure `--` is not parsed as a "non flag arg"; we should get an # input file error here and *not* a linker error. - { ! $CC --; } |& grep -q "no input files" + { ! ${CC} --; } |& grep -q "no input files" # And that positional file args _must_ be files (this is just testing # that we remembered to put the `--` back in the args to the compiler): - { ! $CC -c -- -o foo ${./foo.c}; } \ + { ! ${CC} -c -- -o foo ${./foo.c}; } \ |& grep -q "no such file or directory: '-o'" # Now check that we accept single and multiple positional file args: - $CC -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} - $CC -o positional/main -- positional/foo.o ${./ldflags-main.c} + ${CC} -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} + ${CC} -o positional/main -- positional/foo.o ${./ldflags-main.c} ${emulator} ./positional/main ''} echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h - NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c} + NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" ${CC} -o cflags-check ${./cflags-main.c} ${emulator} ./cflags-check echo "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib - $CC -shared \ + ${CC} -shared \ ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} - NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" ${CC} -lfoo -o ldflags-check ${./ldflags-main.c} ${emulator} ./ldflags-check echo "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2 mkdir -p std-include cp ${./stdio.h} std-include/stdio.h - NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} + NIX_DEBUG=1 ${CC} -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} ${emulator} ./nostdinc-main - $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} + ${CXX} -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ${emulator} ./nostdinc-main++ ${lib.optionalString sanitizersWorking '' echo "checking whether sanitizers are fully functional... ">&2 - $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ${CC} -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} From 8a874c4dc816600e32850ea3d422de2f751d6749 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:59:08 +0300 Subject: [PATCH 23/71] tests-cc-wrapper: Ignore gcc aliases --- pkgs/test/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b34add94830e..e300672ddcac 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -30,6 +30,8 @@ with pkgs; (filter (lib.hasPrefix "gcc")) (filter (lib.hasSuffix "Stdenv")) (filter (n: n != "gccCrossLibcStdenv")) + (filter (n: n != "gcc49Stdenv")) + (filter (n: n != "gcc6Stdenv")) ] ++ lib.optionals (!( (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64) && (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) From f9bd834055a24d6d776d7331357cf9745e511407 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 19 Oct 2024 11:13:31 +0530 Subject: [PATCH 24/71] opengist: 1.6.1 -> 1.7.5 Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 40 +++++++++++++++++++++------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 03b23225ada8..c19fc6fcc702 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -1,20 +1,37 @@ -{ lib, buildGoModule, buildNpmPackage, fetchFromGitHub, moreutils, jq, git }: +{ + lib, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + moreutils, + npm-lockfile-fix, + jq, + git, +}: let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.6.1"; + version = "1.7.5"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; rev = "v${version}"; - hash = "sha256-rJ8oiH08kSSFNgPHKGo68Oi1i3L1SEJyHuzoxKMOZME="; + hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew="; + + # follow https://github.com/thomiceli/opengist/pull/350 and remove here + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; }; frontend = buildNpmPackage { pname = "opengist-frontend"; inherit version src; - nativeBuildInputs = [ moreutils jq ]; + nativeBuildInputs = [ + moreutils + jq + ]; # npm complains of "invalid package". shrug. we can give it a version. preBuild = '' @@ -33,15 +50,17 @@ let cp -R public $out ''; - npmDepsHash = "sha256-Sy321tIQOOrypk+EOGGixEzrPdhA9U8Hak+DOS+d00A="; + npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-IorqXJKzUTUL5zfKRipZaJtRlwVOmTwolJXFG/34Ais="; - tags = [ - "fs_embed" + vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws="; + tags = [ "fs_embed" ]; + ldflags = [ + "-s" + "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" ]; # required for tests @@ -62,10 +81,11 @@ buildGoModule { meta = { description = "Self-hosted pastebin powered by Git"; - mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = [ ]; + changelog = "https://github.com/thomiceli/opengist/blob/master/CHANGELOG.md"; platforms = lib.platforms.unix; + maintainers = [ ]; + mainProgram = "opengist"; }; } From 5d5243fb98a1a3828b7ac56331e75be2f2339c0b Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 19 Oct 2024 11:16:27 +0530 Subject: [PATCH 25/71] opengist: add phanirithvij as maintainer Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index c19fc6fcc702..ef8c6f5b8232 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -85,7 +85,7 @@ buildGoModule { license = lib.licenses.agpl3Only; changelog = "https://github.com/thomiceli/opengist/blob/master/CHANGELOG.md"; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "opengist"; }; } From 2830c0a2cb0c1b66f12619e9c960f221b0e4ce56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 12:39:04 +0000 Subject: [PATCH 26/71] python312Packages.mkdocstrings: 0.26.1 -> 0.26.2 --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b0bfc0ca1554..721c0358fbc9 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-YV9Cncry+RXXGxRYN4dXp5E2msGA4Kq2QSvcPywWV2c="; + hash = "sha256-xZKE8+bNHL+GSQS00MlShOl/3p7+mRV558Pel50ipOI="; }; postPatch = '' From 660836b95cd34befad709bdaa9a4772595c2dfc1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:11:51 +0200 Subject: [PATCH 27/71] msolve: format with nixfmt --- pkgs/by-name/ms/msolve/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index b4e43dbe5cfc..e6c05abfca82 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, flint -, gmp -, mpfr +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + flint, + gmp, + mpfr, }: stdenv.mkDerivation (finalAttrs: { @@ -34,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { description = "Library for polynomial system solving through algebraic methods"; mainProgram = "msolve"; homepage = "https://msolve.lip6.fr"; changelog = "https://github.com/algebraic-solving/msolve/releases/tag/${finalAttrs.src.rev}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; }) From c4a560de85d51c52161b8af6732a625dc2aac907 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:31:25 +0200 Subject: [PATCH 28/71] msolve: 0.7.2 -> 0.7.3 --- pkgs/by-name/ms/msolve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index e6c05abfca82..152b610d7bd5 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-p7fD954aMApyBP58cvGrPwHEqhkxWlaiDHUlQT7kX4c="; + hash = "sha256-F4jEZ3+bA3FADiVZMDNE0T9kd1K1ZBInIaORqQtv+sY="; }; postPatch = '' From 54db2d51cc4da32bbfde8f2e88cf7786f70baa95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Oct 2024 16:03:08 +0200 Subject: [PATCH 29/71] python312Packages.mkdocstrings: update disabled --- pkgs/development/python-modules/mkdocstrings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 721c0358fbc9..2cc0277d6cc6 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "0.26.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mkdocstrings"; From ceedd5924d84542e794511fc6d395dd6dfce1a12 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 16:22:08 +0200 Subject: [PATCH 30/71] sarasa-gothic: 1.0.21 -> 1.0.22 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 5fa852a6d1da..3b6c2e372a8d 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.21"; + version = "1.0.22"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-zoTZ0JwkV6zaKHw1PegzE6NiGGVptBZgCgD8O9ZHHGc="; + hash = "sha256-356T39GotzLj4lu5KYulpFn2RmS7fZOgjz6Yy9M2T6Y="; }; sourceRoot = "."; From 3dd4dedc787998535ba9da6d89c4658fe78f3443 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 14:23:13 +0000 Subject: [PATCH 31/71] diamond: 2.1.9 -> 2.1.10 --- pkgs/applications/science/biology/diamond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index f3afff0f5eb7..314cbd56b67b 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-cTg9TEpz3FSgX2tpfU4y55cCgFY5+mQY86FziHAwd+s="; + sha256 = "sha256-rNwoHb2jbQwL1bnP5KsI/SsHNN9EeXzsGnMpFhXrc1o="; }; From 0e6c70a9fd6ee77c8b822a5510986dcc5314fb77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 17:14:02 +0000 Subject: [PATCH 32/71] android-udev-rules: 20240829 -> 20241019 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b0a4c378ecd6..4f755d71fcb4 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240829"; + version = "20241019"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-QrWEvNcPKSEJghQc0tqb/L71IqeMUmuJLyA0NtzacyY="; + hash = "sha256-ZKJhGobW3F339PBsIezMTbzouomYGxDJyFbJMGIeim4="; }; installPhase = '' From 6252e0ea767537a097308faf5a14c48770b52149 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 17:28:08 +0000 Subject: [PATCH 33/71] srgn: 0.13.2 -> 0.13.3 --- pkgs/by-name/sr/srgn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index cb1e0fc66bdd..9e39aa27b3c8 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-yVjxNTftrtKb/KHRZG7E3JcsCEtixhfBiHl/6zdcLMo="; + hash = "sha256-JjO4ZH4CYu2qwYfUrwTASYuxyBjObLb9ydPPbObew0g="; }; - cargoHash = "sha256-Z8y5gN4CzfllUzSMUyCc7TZKeIYVZtATnaIQIga5cAk="; + cargoHash = "sha256-/Y85FbmHfape2K8tdu/amjW8Q5Eg19HOPCE/x8qZ8uY="; nativeBuildInputs = [ installShellFiles ]; From e9830b4520a75ed42d7d22555d330b1a1c041b95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 18:33:57 +0000 Subject: [PATCH 34/71] polyphone: 2.4.0 -> 2.4.1 --- pkgs/applications/audio/polyphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 2a38222949f6..436a690ffd62 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs="; + hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0="; }; nativeBuildInputs = [ From 209bada01b29c2a7fef06c645807dd488ad5719e Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Sat, 19 Oct 2024 20:48:09 +0200 Subject: [PATCH 35/71] python3Packages.parselmouth: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/parselmouth/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix index 43e718c133ae..78417fe48c0b 100644 --- a/pkgs/development/python-modules/parselmouth/default.nix +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -14,17 +14,16 @@ buildPythonPackage rec { pname = "parselmouth"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YannickJadoul"; repo = "Parselmouth"; - # Stable branch with cherry picked changes to fit to the newer dependencies versions https://github.com/YannickJadoul/Parselmouth/issues/130 - rev = "c2cbecc0ce4a0b5d3052cc6c6fbddf4bf133655d"; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+6id0PVfpiVjee7O4ZoskNK0dz5ZmTYRTtum3B3tIgE="; + hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU="; }; configurePhase = '' From 018cdd0ad5fc333c8bcfa597d406c1c0089a0922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 20:09:48 +0000 Subject: [PATCH 36/71] istioctl: 1.23.1 -> 1.23.2 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index c62448908418..55536c840e67 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-ksTtjPzEY//JMLKzTMqkeqZqD92euvqV0iXziYQvFGg="; + hash = "sha256-Vyd32T19dw0j7PfuAcs6cuDlAhtMnRcUZXvYtEM7D4w="; }; - vendorHash = "sha256-4zNPI5tefOgLwbzxRM9NS/szlUjGo2BiruqP92qmwBU="; + vendorHash = "sha256-Sh/SsVIque5xdyOGCNU188pi0JCDXv90LlV7NCmgpGQ="; nativeBuildInputs = [ installShellFiles ]; From 338743fe345037a185a3e9abf9a98f95a8066a32 Mon Sep 17 00:00:00 2001 From: Philip White Date: Fri, 18 Oct 2024 20:07:43 -0700 Subject: [PATCH 37/71] rustic: 0.9.1 -> 0.9.3 --- pkgs/by-name/ru/rustic/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 07d8ddd6da76..9dc223823145 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-hkkylXJOhPOC4p+MOuYCzfcmCoHmm+/8afsaPFwD1/s="; + hash = "sha256-5Zr3ZxKUT8S8vfHNaCResF+S2UcHrk5pGwJH4riTzIw="; }; - cargoHash = "sha256-Rh96vPLAxz8KCIk9y9TFB2fP0JngnM9LSsClWfgYUG0="; + cargoHash = "sha256-HOpBBXJk8bHjXfRq8UczfMjr3bM91lB62taTlUGUC+M="; nativeBuildInputs = [ installShellFiles ]; @@ -49,6 +49,9 @@ rustPlatform.buildRustPackage rec { lib.licenses.mit lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.nobbz ]; + maintainers = [ + lib.maintainers.nobbz + lib.maintainers.pmw + ]; }; } From 38de1728fb360376c4c168691b499bd92caa03df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 22:37:36 +0000 Subject: [PATCH 38/71] python312Packages.django-modeltranslation: 0.19.9 -> 0.19.10 --- .../python-modules/django-modeltranslation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 3b7cd55b494c..1fb63c59cd4c 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.9"; + version = "0.19.10"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A="; + hash = "sha256-E3CaQx5SGOnxqjLFY0opcKZF4DMl2HKSUD0gOnA25RA="; }; disabled = pythonOlder "3.6"; From 3a2b3c7ae37c5ca3afcb96a24ed05c8ffa172fa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 23:55:13 +0000 Subject: [PATCH 39/71] kclvm_cli: 0.10.0 -> 0.10.3 --- pkgs/by-name/kc/kclvm_cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 100c892f39a1..12a8c5935681 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; + hash = "sha256-qIaDc10NxQKBH7WRzzkQ6bQfkSqsDrFxSwSX+Hf7qS8="; }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-2694O2q6UbNySgn76aBTjdqt2Hh1GrdRaro064fGBrI="; + cargoHash = "sha256-mB4qOUj9qZmbstvBIyaWHEzX3DQ7tLhQKDEvea4Bnyk="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( From 2676fb552f43df2b6cae9076797d72cc480ddd87 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sun, 20 Oct 2024 07:19:35 +0800 Subject: [PATCH 40/71] imgui: 1.90.6 -> 1.91.4 https://github.com/ocornut/imgui/releases/tag/v1.91.4 --- pkgs/development/libraries/imgui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 315a73171067..16f9976e2df5 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.6"; + version = "1.91.4"; outputs = [ # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake # into different prefixes but expects the merged layout at import time @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - sha256 = "sha256-FSob6FPfg0tF0n72twA5/moLvEaB251BPkIDJUXhYbg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; }; cmakeRules = "${vcpkgSource}/ports/imgui"; From 606d7e72ae7c9f536938d25e1659445058b59e0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 02:34:28 +0000 Subject: [PATCH 41/71] cargo-sort: 1.0.9 -> 1.1.0 --- pkgs/development/tools/rust/cargo-sort/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index 53f941e788d0..51994805f3dd 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; + sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; + cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; From 66a1bc5b06b91fa3101207495867c85e71b33d23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:13:18 +0000 Subject: [PATCH 42/71] python312Packages.xdg-base-dirs: 6.0.1 -> 6.0.2 --- pkgs/development/python-modules/xdg-base-dirs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix index e65785377a57..fa8aa9860de3 100644 --- a/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.1"; + version = "6.0.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = "xdg-base-dirs"; - rev = version; - hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; + rev = "refs/tags/${version}"; + hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY="; }; nativeBuildInputs = [ poetry-core ]; From 77a6d673c6bcaff8facb411909e0bf82ccc9b3bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:18:16 +0000 Subject: [PATCH 43/71] vouch-proxy: 0.40.0 -> 0.41.0 --- pkgs/servers/vouch-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 28a06b0e0216..bae680cf78bc 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-/B7MMRkI5DhDBWa53mgFUME1CR3FSxxQ8UWjlN19EmQ="; + hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s="; }; vendorHash = "sha256-1k9YFdackF10iJWJ22XlaENlOfRkZMs+IedDWnd/h8E="; From 7a604034801ce95a07a421ce0857ecf1539edbff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:48:50 +0000 Subject: [PATCH 44/71] python312Packages.python-roborock: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 289a4e41005e..1385f887bd12 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Mszy1p7TOEynCePCEiLhwdWiKXfFnlo3/a3vc9TxGeY="; + hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI="; }; postPatch = '' From 092d68b3234674c58be7b6c57f704980824faff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:30:45 +0000 Subject: [PATCH 45/71] vals: 0.37.5 -> 0.37.7 --- pkgs/tools/security/vals/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 6ffb4d48253f..1487b5caa891 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.5"; + version = "0.37.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8="; + sha256 = "sha256-iRXBT3VpEVHna3GkMxVSVRqQ2HTK7gCd6LkthwrBMx4="; }; - vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY="; + vendorHash = "sha256-1iyJ56YKu/WVb7dPP7YE07kdbJte2/Sww8cQu+epFNc="; proxyVendor = true; From f3a06cef2b577358818495431a7a69813ff8d3e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:40:49 +0000 Subject: [PATCH 46/71] opensearch: 2.17.0 -> 2.17.1 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 4177c8a2e570..7a9cf1ce2efc 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-I5CI9t5jsayE58O3lGRLQ2zj5lClWldKNsPBS4tNtfs="; + hash = "sha256-9m7Vt+x4SPOBAqVL88gufSmqhvAiCcnOi7bL43XzCiU="; }; nativeBuildInputs = [ From f89d012c5006a501455f529c4f32541a7c01fbfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:45:22 +0000 Subject: [PATCH 47/71] litmusctl: 1.10.0 -> 1.11.0 --- pkgs/by-name/li/litmusctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index fdc95da3a70f..5fd5b3ad54d4 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.10.0"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-0I07qgl/yyNAG19eAkZAXh7TkK3V1lnQTPXskF6k/L0="; + hash = "sha256-ByDtmKLdPSFGIPCdFlNr2yv3gnyfdjiuIuKcryvKwkY="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; From 8b59a0848a8a8afd0a4abdb8499a13fc8bca046d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:46:08 +0000 Subject: [PATCH 48/71] julia-mono: 0.057 -> 0.058 --- pkgs/data/fonts/julia-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 1a447908192c..132d0b87a247 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.057"; + version = "0.058"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-SSTv/cyZ+7nK0VvQPqQ+T5JXDXOZgLmv++cjHLlObb8="; + hash = "sha256-QKMTU6ISP983Kg4ZxyPV4IgiuO0ZXMiOtvZPwP7dF7k="; }; installPhase = '' From 2f601a4c87611f5929feb5ec0eb13d7fd16651e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:18:34 +0000 Subject: [PATCH 49/71] home-assistant-custom-lovelace-modules.hourly-weather: 6.2.0 -> 6.4.0 --- .../custom-lovelace-modules/hourly-weather/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix index f8fa78acf18d..0595fa25ed88 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A="; + hash = "sha256-Aaeo3dL7N2vRTQU6bEj+jfxUAclI+8ROAUuF0PeOdw8="; }; - npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8="; + npmDepsHash = "sha256-unTZvllmfEBXWgEbObJWMPpEJzgrihKKK1eMREWpbVE="; env.CYPRESS_INSTALL_BINARY = "0"; From 4004d99628ccc6e193d9e1cf1517b9b3fd0468a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:21:42 +0000 Subject: [PATCH 50/71] patch2pr: 0.28.0 -> 0.29.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 93188ebfc558..b58f84ed1003 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-Pr2h5iezn//oyvuUoq5B49wEL1cUXOHhHjR3ylMXowQ="; + hash = "sha256-eWOzK08ZlNORaRRtDumxOhsQWNXxk48jxcanwhEOChY="; }; - vendorHash = "sha256-6w49XQNElSHpOamEZNpvvr67vYrZYXy2Sm7dWMh6OiU="; + vendorHash = "sha256-x2w1HYrJo0HqyGGlIaxKqy1XYj/akQm0ijbYuK7qg58="; ldflags = [ "-X main.version=${version}" From 544a89f00e33f0f57f2a52b5f5b452ecf710585c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:29:09 +0000 Subject: [PATCH 51/71] prometheus-sql-exporter: 0.5.6 -> 0.5.7 --- pkgs/servers/monitoring/prometheus/sql-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 1ebd2be3c4ba..c0dd2e133f9d 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kNIf8HwqNPGJAR8+/IkGn/5ryMEd6rGCixjnKG63xcY="; + sha256 = "sha256-9e3prTe7mHQJfSeIL+bEkW6GykvxA8ryD3GHgxk56Us="; }; vendorHash = null; From 5021f069552a4bf024076fb9dac08088b41e9502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:30:02 +0000 Subject: [PATCH 52/71] argocd: 2.12.4 -> 2.12.6 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 985c0e3bebdc..3fbe1924e956 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.12.4"; + version = "2.12.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-CxxaNm6O0wGvh1V0RmU4eA654u2ooL41EmlNX49KEE0="; + hash = "sha256-Lu0RUCSOrNNQ17CZGv/+ic3jPz4+3433JjwnjVzYzF4="; }; proxyVendor = true; # darwin/linux hash mismatch From 2b52772e9610b981205be77cc01b687516ce2b44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:49:29 +0000 Subject: [PATCH 53/71] nsc: 2.9.0 -> 2.10.0 --- pkgs/tools/system/nsc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index deefe7056929..fb9783a99806 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4="; + hash = "sha256-iobC5qhrQg/vy161atU0NqqKnvsr1CGaiXAe6Ln+Tn8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q="; + vendorHash = "sha256-CirTiIQD3Xvt+ly7Ll3THLwImqbyQDDIz092ihosejY="; nativeBuildInputs = [ installShellFiles ]; @@ -46,7 +46,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.10.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. From 458d9e29fd71efd9f0582c4a44037c13ba478cf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:14:56 +0000 Subject: [PATCH 54/71] kubedb-cli: 0.48.0 -> 0.48.1 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index f70dcee4682d..bcded90dc8a3 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.48.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; + sha256 = "sha256-jk+IUqM0/7qVKBMFntQFr52B3TJYEGrmT/DKcgfrw3Q="; }; vendorHash = null; From b2c657cae5b053e38e3b1a50b8296f5d3dca657c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:15:46 +0000 Subject: [PATCH 55/71] stackql: 0.5.742 -> 0.5.748 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index fb0b02d559cd..b670497d4a42 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.742"; + version = "0.5.748"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-GMc22n0y4lKv4DlG9069p/TrMJLyw0Zdiykuo41Tgys="; + hash = "sha256-3nt0hGBbS99WCRs3WnaB+0T/DS/uWROigYhXJw0fms8="; }; - vendorHash = "sha256-dssGqcS9l3VipEypKErlCeRs087Tb5Kx4VXvkErZar4="; + vendorHash = "sha256-oIpkhZHqg02qs68/ljuhNkw0BiIkY++du/pJRHXlPs0="; ldflags = [ "-s" From f6a6ae5cc05fe2b63c638c38a60a43659491dbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:40:40 +0000 Subject: [PATCH 56/71] prometheus-mongodb-exporter: 0.41.1 -> 0.41.2 --- pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index 5df77a26541e..f2811a8c53e3 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-2/oYfeybXnaoccyhriCHEY5lZcojLnk9qoiSlt4TDZY="; + hash = "sha256-d2/N/NqtRglRN/3E7B5FOMpcQXP/taKFYodc6mhW7A4="; }; - vendorHash = "sha256-xKqt4JdHbFxMvFMa/zi8qGm9OZ3YFjGJQrMXfBfj4xA="; + vendorHash = "sha256-hy2w1Ix202gSJyp/EQ6uKJC8y16nw8Y78kDaP9LbU/4="; ldflags = [ "-s" From bd5d0f489dc6a16d0730020159e111c07b23ae15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:40:49 +0000 Subject: [PATCH 57/71] buildkite-cli: 3.1.0 -> 3.2.0 --- .../tools/continuous-integration/buildkite-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index f59f783231eb..d8b40e0ca30d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fidE4MSZS53Odv5tlNPFJEhcb8JTmILVRNmcVF9Z9Oc="; + sha256 = "sha256-lmsL73jck3vt6oDP699BrMq0RyrXAUuTjKtvHcNtcZc="; }; - vendorHash = "sha256-stxsMJPBUclLlmR88c7OwAhsw9dhyBIhStuxLVu00bo="; + vendorHash = "sha256-PZHMJpyZ2w3GFHQW56m+9POyXR6wMt3TmNaQENg9lWw="; doCheck = false; From 04a6c3b4567e14c29dfde43c4b1a6fc213478e09 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:01:55 +0800 Subject: [PATCH 58/71] dbip-country-lite: move to by-name --- .../db/dbip-country-lite/package.nix} | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/{data/misc/dbip-country-lite/default.nix => by-name/db/dbip-country-lite/package.nix} (80%) diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/by-name/db/dbip-country-lite/package.nix similarity index 80% rename from pkgs/data/misc/dbip-country-lite/default.nix rename to pkgs/by-name/db/dbip-country-lite/package.nix index cda4a19d26c8..74f9ce977067 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -1,8 +1,8 @@ -{ lib -, stdenvNoCC -, fetchurl +{ + lib, + stdenvNoCC, + fetchurl, }: - stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; version = "2024-10"; @@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb"; - meta = with lib; { + meta = { description = "Free IP to Country Lite database by DB-IP"; homepage = "https://db-ip.com/db/download/ip-to-country-lite"; - license = licenses.cc-by-40; - maintainers = with maintainers; [ nickcao ]; - platforms = platforms.all; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ nickcao ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68d3c47aac5e..691d4554a222 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -528,8 +528,6 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; - dcgm = callPackage ../os-specific/linux/dcgm { }; deck = callPackage ../by-name/de/deck/package.nix { From 6ed737602113d086ef3417dbcbe69d94b7c516e4 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:02:09 +0800 Subject: [PATCH 59/71] dbip-asn-lite: init at 2024-10 --- pkgs/by-name/db/dbip-asn-lite/package.nix | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/db/dbip-asn-lite/package.nix diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix new file mode 100644 index 000000000000..8d844d3972d4 --- /dev/null +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-asn-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-asn-lite.mmdb + install -Dm444 dbip-asn-lite.mmdb "$out/share/dbip/dbip-asn-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-asn-lite.mmdb"; + + meta = { + description = "Free IP to ASN Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-asn-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) From 91f8d1a84cddeb15fbe36a928e06994577c1f7a0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:02:15 +0800 Subject: [PATCH 60/71] dbip-city-lite: init at 2024-10 --- pkgs/by-name/db/dbip-city-lite/package.nix | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/db/dbip-city-lite/package.nix diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix new file mode 100644 index 000000000000..b0e3e4260cbe --- /dev/null +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-city-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-city-lite.mmdb + install -Dm444 dbip-city-lite.mmdb "$out/share/dbip/dbip-city-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-city-lite.mmdb"; + + meta = { + description = "Free IP to City Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-city-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) From ac39748d1423ff519e62c8d89e9968e23634ac50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Oct 2024 10:11:15 +0200 Subject: [PATCH 61/71] python312Packages.types-beautifulsoup4: 4.12.0.20240907 -> 4.12.0.20241020 --- .../python-modules/types-beautifulsoup4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 6bdcf999bed7..17cc87e26b01 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240907"; + version = "4.12.0.20241020"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE="; + hash = "sha256-FYNw0I0M1Ei9EbEypQ/1J5I3pdS1g3vroHTeFSpRMFk="; }; build-system = [ setuptools ]; From f6aa7397ac8364e8f2bea969cfa853a2f79c44ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Oct 2024 10:12:36 +0200 Subject: [PATCH 62/71] python312Packages.pyexploitdb: 0.2.39 -> 0.2.40 Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 25e9078d5c1b..a23a0ce879e8 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.39"; + version = "0.2.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-Q7fql+IEEdfGlY8Uq3D7Y0+17Hg5oLjMn8Nq1HA2HMQ="; + hash = "sha256-3o4KnWau2Sxkj18ZoY6EsSszm0Z0Z1Gz/KWr1ZH7FTs="; }; build-system = [ setuptools ]; From 3696366989265ae4a36848ca177e993c51dcd697 Mon Sep 17 00:00:00 2001 From: Jan Kremer Date: Thu, 17 Oct 2024 19:33:32 +0200 Subject: [PATCH 63/71] prettier-plugin-go-template: fix install script --- .../pr/prettier-plugin-go-template/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix index 79161f56c481..02edecce4a52 100644 --- a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix @@ -6,7 +6,7 @@ buildNpmPackage rec { pname = "prettier-plugin-go-template"; - version = "0-unstable-2023-07-26"; + version = "0.0.15-unstable-2023-07-26"; src = fetchFromGitHub { owner = "NiklasPor"; @@ -17,6 +17,15 @@ buildNpmPackage rec { npmDepsHash = "sha256-PpJnVZFRxpUHux2jIBDtyBS4qNo6IJY4kwTAq6stEVQ="; + dontNpmPrune = true; + + # Fixes error: Cannot find module 'prettier' + postInstall = '' + pushd "$nodeModulesPath" + find -mindepth 1 -maxdepth 1 -type d -print0 | grep --null-data -Exv "\./(ulid|prettier)" | xargs -0 rm -rfv + popd + ''; + meta = { description = "Fixes prettier formatting for go templates"; mainProgram = "prettier-plugin-go-template"; From fbf1cda2adb58810ce89a3b4f941636dac31f80c Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Sat, 19 Oct 2024 14:13:42 +0200 Subject: [PATCH 64/71] meilisearch: 1.9.0 -> 1.10.2 --- pkgs/servers/search/meilisearch/Cargo.lock | 1753 ++++++++++------- pkgs/servers/search/meilisearch/default.nix | 9 +- .../search/meilisearch/time-crate.patch | 28 - 3 files changed, 1055 insertions(+), 735 deletions(-) delete mode 100644 pkgs/servers/search/meilisearch/time-crate.patch diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 51df0ea7bbb1..e6cf59d4cadf 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -36,18 +36,18 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash", + "ahash 0.8.11", "base64 0.22.1", - "bitflags 2.5.0", + "bitflags 2.6.0", "brotli", "bytes", "bytestring", @@ -55,7 +55,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.11", "httparse", "httpdate", @@ -92,7 +92,6 @@ dependencies = [ "bytestring", "cfg-if", "http 0.2.11", - "regex", "regex-lite", "serde", "tracing", @@ -100,9 +99,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "actix-macros", "futures-core", @@ -150,11 +149,11 @@ dependencies = [ "futures-core", "impl-more", "pin-project-lite", + "rustls-pki-types", "tokio", "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.3", ] [[package]] @@ -169,9 +168,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.6.0" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -183,7 +182,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash", + "ahash 0.8.11", "bytes", "bytestring", "cfg-if", @@ -210,26 +209,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "actix-web-static-files" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" -dependencies = [ - "actix-web", - "derive_more", - "futures-util", - "static-files", + "syn 2.0.60", ] [[package]] @@ -258,6 +245,17 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.8.11" @@ -265,6 +263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -273,9 +272,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -357,9 +356,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -379,6 +378,12 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "arroy" version = "0.4.0" @@ -389,7 +394,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.4", + "memmap2", "ordered-float", "rand", "rayon", @@ -408,33 +413,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -442,19 +425,10 @@ dependencies = [ ] [[package]] -name = "atomic" -version = "0.5.3" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -495,15 +469,9 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "benchmarks" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "bytes", @@ -546,16 +514,16 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", @@ -598,13 +566,25 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -614,6 +594,30 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", + "syn_derive", +] + [[package]] name = "brotli" version = "6.0.0" @@ -637,9 +641,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -648,7 +652,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "time", @@ -657,20 +661,43 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-unit" -version = "4.0.19" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" dependencies = [ + "rust_decimal", "serde", "utf8-width", ] +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytecount" version = "0.6.3" @@ -705,9 +732,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -750,16 +777,16 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00" +checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", "half 2.4.0", - "memmap2 0.9.4", + "memmap2", "num-traits", "num_cpus", "rand", @@ -768,23 +795,23 @@ dependencies = [ "safetensors", "thiserror", "yoke", - "zip", + "zip 1.1.4", ] [[package]] name = "candle-kernels" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5845911a44164ebb73b56a0e23793ba1b583bad102af7400fe4768babc5815b2" +checksum = "8bc0a71be8b2f0950b63fd602a5e10a74a4f94a5fd63059ae455e96163389488" dependencies = [ "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a27533c8edfc915a6459f9850641ef523a829fa1a181c670766c1f752d873a" +checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" dependencies = [ "candle-core", "half 2.4.0", @@ -797,13 +824,14 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5847699f0643da05e57fc473672566e93dc36d82c1b7eeb970c6154d3434fe1" +checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" dependencies = [ "byteorder", "candle-core", "candle-nn", + "fancy-regex 0.13.0", "num-traits", "rand", "rayon", @@ -838,9 +866,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.18.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +checksum = "4895c018bb228aa6b3ba1a0285543fcb4b704734c3fb1f72afaa75aa769500c1" dependencies = [ "serde", "toml", @@ -854,12 +882,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -886,6 +915,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "change-detection" version = "1.2.0" @@ -898,20 +933,17 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.11" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a09ae38cfcc153f01576c3f579dfd916e0320f1b474f298c8d680b2dd92eb6" +checksum = "55ff52497324e7d168505a16949ae836c14595606fab94687238d2f6c8d4c798" dependencies = [ "aho-corasick", - "cow-utils", "csv", - "deunicode", "either", "fst", "irg-kvariants", "jieba-rs", "lindera", - "litemap", "once_cell", "pinyin", "serde", @@ -919,7 +951,6 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", - "zerovec", ] [[package]] @@ -972,9 +1003,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -982,23 +1013,23 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.60", @@ -1006,9 +1037,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "color-spantrace" @@ -1053,10 +1084,30 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-random" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1084,28 +1135,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "cow-utils" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" - [[package]] name = "cpufeatures" version = "0.2.12" @@ -1116,10 +1151,25 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.4.0" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1160,12 +1210,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam" version = "0.8.4" @@ -1181,9 +1225,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1218,9 +1262,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1261,11 +1305,12 @@ dependencies = [ [[package]] name = "cudarc" -version = "0.10.0" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" +checksum = "56ee2a3fbbd981e1c7ea73cc2af136e754eb22d17436de37155227ee4dbe0cf4" dependencies = [ "half 2.4.0", + "libloading", ] [[package]] @@ -1338,6 +1383,24 @@ dependencies = [ "syn 2.0.60", ] +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + [[package]] name = "debugid" version = "0.8.0" @@ -1347,6 +1410,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deranged" version = "0.3.11" @@ -1377,15 +1446,6 @@ dependencies = [ "derive_builder_macro 0.12.0", ] -[[package]] -name = "derive_builder" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f59169f400d8087f238c5c0c7db6a28af18681717f3b623227d92f397e938c7" -dependencies = [ - "derive_builder_macro 0.13.1", -] - [[package]] name = "derive_builder" version = "0.20.0" @@ -1407,18 +1467,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ec317cc3e7ef0928b0ca6e4a634a4d6c001672ae210438cf114a83e56b018d" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_builder_core" version = "0.20.0" @@ -1441,16 +1489,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870368c3fb35b8031abb378861d4460f573b92238ec2152c927a21f77e3e0127" -dependencies = [ - "derive_builder_core 0.13.1", - "syn 1.0.109", -] - [[package]] name = "derive_builder_macro" version = "0.20.0" @@ -1476,9 +1514,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418e814bb893a61b25a60db71dccab7cb70035d94ffe58c9b4a70387ac42083" +checksum = "bfe971a2a48625fda3198032f35de60939828c4aed47d76715c21698801b985c" dependencies = [ "actix-http", "actix-utils", @@ -1488,14 +1526,14 @@ dependencies = [ "serde-cs", "serde_json", "serde_urlencoded", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "deserr-internal" -version = "0.7.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadd9624c995ecbd6d6c81ec0804fbbb335e3acba5326a06067ccd33295a37e" +checksum = "aae89f00c97a75940185084a826c0aace055774ad57a58211625606449ea0bd8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1503,12 +1541,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "deunicode" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" - [[package]] name = "digest" version = "0.10.7" @@ -1562,6 +1594,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1579,15 +1622,14 @@ dependencies = [ [[package]] name = "dump" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.11", + "http 1.1.0", "maplit", "meili-snap", - "meilisearch-auth", "meilisearch-types", "once_cell", "regex", @@ -1614,9 +1656,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1715,7 +1757,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.60", @@ -1723,18 +1765,18 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.5.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", @@ -1773,40 +1815,27 @@ dependencies = [ "regex", ] +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "faux" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b55a7f424e532314115b5cdc6d9711b15ac453bfe0dcfa212baebc5efacd60" -dependencies = [ - "faux_macros", - "paste", -] - -[[package]] -name = "faux_macros" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.60", - "uuid", -] +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "file-store" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "faux", "tempfile", "thiserror", "tracing", @@ -1827,7 +1856,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "nom", @@ -1837,9 +1866,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1847,7 +1876,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -1874,6 +1903,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.30" @@ -1965,7 +2000,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arbitrary", "clap", @@ -1987,14 +2022,15 @@ dependencies = [ [[package]] name = "fxprof-processed-profile" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", + "serde_derive", "serde_json", ] @@ -2165,11 +2201,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2184,9 +2220,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grenad" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c297f45167e6d543eb728e12ff284283e4ba2182a25c6cdcec883fda3316c7e7" +checksum = "350d89047298d3b1b40050acd11ab76e487b854a104b760ebc5a7f375093de77" dependencies = [ "bytemuck", "byteorder", @@ -2213,6 +2249,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -2235,33 +2290,39 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash", + "ahash 0.8.11", "allocator-api2", ] [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin", "stable_deref_trait", ] @@ -2272,19 +2333,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "heed" -version = "0.20.2" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60d7cff16094be9627830b399c087a25017e93fb3768b87cd656a68ccb1ebe8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "heed" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "heed-traits", "heed-types", "libc", "lmdb-master-sys", "once_cell", - "page_size 0.6.0", + "page_size", "synchronoise", "url", ] @@ -2297,9 +2364,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" +checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" dependencies = [ "bincode", "byteorder", @@ -2326,7 +2393,7 @@ version = "0.3.2" source = "git+https://github.com/dureuill/hf-hub.git?branch=rust_tls#88d4f11cb9fa079f2912bacb96f5080b16825ce8" dependencies = [ "dirs", - "http 1.0.0", + "http 1.1.0", "indicatif", "log", "rand", @@ -2358,9 +2425,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2369,12 +2436,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.11", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", "pin-project-lite", ] @@ -2392,40 +2471,61 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.27" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http 0.2.11", + "h2 0.4.5", + "http 1.1.0", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.11", + "http 1.1.0", "hyper", - "rustls 0.21.12", + "hyper-util", + "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2452,7 +2552,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "arroy", @@ -2460,7 +2560,7 @@ dependencies = [ "bincode", "crossbeam", "csv", - "derive_builder 0.12.0", + "derive_builder 0.20.0", "dump", "enum-iterator", "file-store", @@ -2470,7 +2570,7 @@ dependencies = [ "meili-snap", "meilisearch-auth", "meilisearch-types", - "page_size 0.5.0", + "page_size", "rayon", "roaring", "serde", @@ -2491,7 +2591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", "serde", ] @@ -2519,9 +2619,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -2530,7 +2630,6 @@ dependencies = [ "pest_derive", "serde", "similar", - "yaml-rust", ] [[package]] @@ -2542,17 +2641,6 @@ 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 = "ipnet" version = "2.8.0" @@ -2561,9 +2649,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "irg-kvariants" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78" +checksum = "ef2af7c331f2536964a32b78a7d2e0963d78b42f4a76323b16cc7d94b1ddce26" dependencies = [ "csv", "once_cell", @@ -2572,12 +2660,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.31", + "libc", "windows-sys 0.52.0", ] @@ -2608,6 +2696,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2616,13 +2713,13 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jieba-rs" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +checksum = "c1e2b0210dc78b49337af9e49d7ae41a39dceac6e5985613f1cf7763e2f76a25" dependencies = [ "cedarwood", + "derive_builder 0.20.0", "fxhash", - "hashbrown", "lazy_static", "phf", "phf_codegen", @@ -2631,9 +2728,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2649,7 +2746,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -2657,9 +2754,9 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.2.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", "js-sys", @@ -2697,9 +2794,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2718,15 +2815,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2736,12 +2833,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -2752,9 +2849,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2762,9 +2859,9 @@ dependencies = [ [[package]] name = "libproc" -version = "0.14.2" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229004ebba9d1d5caf41623f1523b6d52abb47d9f6ab87f7e6fc992e3b854aef" +checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" dependencies = [ "bindgen", "errno", @@ -2785,9 +2882,9 @@ dependencies = [ [[package]] name = "lindera" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd4fa369654517f72c10b24adf03ad4ce69d19facb79c3cb3cf9b4580ac352f" +checksum = "c6cbc1aad631a7da0a7e9bc4b8669fa92ac9ca8eeb7b35a807376dd3034443ff" dependencies = [ "lindera-analyzer", "lindera-core", @@ -2798,9 +2895,9 @@ dependencies = [ [[package]] name = "lindera-analyzer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cba7fe275cb8ec4c594cfee9cc39e48b71e02a089457d52f3e70dc146a8133" +checksum = "74508ffbb24e36905d1718b261460e378a748029b07bcd7e06f0d18500b8194c" dependencies = [ "anyhow", "bincode", @@ -2827,10 +2924,23 @@ dependencies = [ ] [[package]] -name = "lindera-cc-cedict" -version = "0.31.0" +name = "lindera-assets" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240adf9faba3f09ad16557aefcd316dd00ebb940ac94334a629660d772f118c1" +checksum = "6a677c371ecb3bd02b751be306ea09876cd47cf426303ad5f10a3fd6f9a4ded6" +dependencies = [ + "encoding", + "flate2", + "lindera-core", + "tar", + "ureq", +] + +[[package]] +name = "lindera-cc-cedict" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35944000d05a177e981f037b5f0805f283b32f05a0c35713003bef136ca8cb4" dependencies = [ "bincode", "byteorder", @@ -2842,9 +2952,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12241f9e74babe708a0b9441d9f3fa67cb29fd01257918f30ffd480ca568820" +checksum = "85b8f642bc9c9130682569975772a17336c6aab26d11fc0f823f3e663167ace6" dependencies = [ "anyhow", "lindera-core", @@ -2854,9 +2964,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f9f7a858d70ff9e4383cbd507ca9e98c8faf0319e08c10df4c30cb58c9ca6c" +checksum = "a7825d8d63592aa5727d67bd209170ac82df56c369533efbf0ddbac277bb68ec" dependencies = [ "anyhow", "flate2", @@ -2865,9 +2975,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f09810ab98ce2a084d788ac38fbb7b31697f34bc47c61de0d880320a674bd15" +checksum = "0c28191456debc98af6aa5f7db77872471983e9fa2a737b1c232b6ef543aed62" dependencies = [ "anyhow", "bincode", @@ -2882,9 +2992,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53400c9b2dd6b45f82d9fa5b5efe079f3acaf6ce609dba8d42c8a76baaa2b12" +checksum = "4788a1ead2f63f3fc2888109272921dedd86a87b7d0bf05e9daab46600daac51" dependencies = [ "anyhow", "flate2", @@ -2893,9 +3003,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2053d064a515839250438b8dfa6cf445e2b97633232ded34a54f267e945d196e" +checksum = "bdf5f91725e32b9a21b1656baa7030766c9bafc4de4b4ddeb8ffdde7224dd2f6" dependencies = [ "anyhow", "bincode", @@ -2918,9 +3028,9 @@ dependencies = [ [[package]] name = "lindera-dictionary-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f486924055f8bedcc5877572e4dc91fbc10370862430ac2e5f7f0d671a18c8" +checksum = "e41f00ba7ac541b0ffd8c30e7a73f2dd197546cc5780462ec4f2e4782945a780" dependencies = [ "anyhow", "bincode", @@ -2940,9 +3050,9 @@ dependencies = [ [[package]] name = "lindera-filter" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3904fc279f0297f6fd6210435adab1f8c82ba84eba8635407c791af51c0d8a" +checksum = "273d27e01e1377e2647314a4a5b9bdca4b52a867b319069ebae8c10191146eca" dependencies = [ "anyhow", "csv", @@ -2965,9 +3075,9 @@ dependencies = [ [[package]] name = "lindera-ipadic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa3ef2f1f6838b0fa2e2fca2896242bb83bc877c1760cdb6fa23449ab95d664" +checksum = "b97a52ff0af5acb700093badaf7078051ab9ffd9071859724445a60193995f1f" dependencies = [ "bincode", "byteorder", @@ -2979,9 +3089,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41287db18eadb58d73a04d49778d41c161549fbbbe155d4338976b7b8541c7d" +checksum = "bf5031c52686128db13f774b2c5a8abfd52b4cc1f904041d8411aa19d630ce4d" dependencies = [ "anyhow", "lindera-core", @@ -2991,9 +3101,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49382256f245078400bf7e72663f9eb30afcd9ed54cd46f29d7db1be529678e1" +checksum = "d6b36764b27b169aa11d24888141f206a6c246a5b195c1e67127485bac512fb6" dependencies = [ "bincode", "byteorder", @@ -3005,9 +3115,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9cfd2fda68ef526ef0c7b50c5d4d5582a4daa6ecd0cea9e2b0b62564a2a5d" +checksum = "abf36e40ace904741efdd883ed5c4dba6425f65156a0fb5d3f73a386335950dc" dependencies = [ "anyhow", "lindera-core", @@ -3017,27 +3127,24 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f86d03a863f3ae1d269e7b7d4dd2cce9385a53463479bafc5d7aa48719f36db" +checksum = "4c92a1a3564b531953f0238cbcea392f2905f7b27b449978cf9e702a80e1086d" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-ko-dic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-ko-dic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0f44f2e56358c5879dfb5e7f76cc6ba7853ec31082c4e3f8fb65fb2d849c51" +checksum = "9f2c60425abc1548570c2568858f74a1f042105ecd89faa39c651b4315350fd9" dependencies = [ "anyhow", "lindera-core", @@ -3047,9 +3154,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5182735cdc2832ac757b31e8a5b150a3514357a30efe3dec212f8dcb06ba14" +checksum = "903e558981bcb6f59870aa7d6b4bcb09e8f7db778886a6a70f67fd74c9fa2ca3" dependencies = [ "bincode", "lindera-core", @@ -3061,27 +3168,24 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c63da104728dd1cf14bfa564753cbfa996f6078ed2e23e31475bd1d639fc597" +checksum = "d227c3ce9cbd905f865c46c65a0470fd04e89b71104d7f92baa71a212ffe1d4b" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-unidic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-unidic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04acecbc068dac21766a1b7ed1f2608b6f250d10b4f8bff67abc2a00437a0974" +checksum = "99e2c50015c242e02c451acb6748667ac6fd1d3d667cd7db48cd89e2f2d2377e" dependencies = [ "anyhow", "lindera-core", @@ -3095,12 +3199,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.4.12" @@ -3109,9 +3207,9 @@ checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "liquid" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f68ae1011499ae2ef879f631891f21c78e309755f4a5e483c4a8f12e10b609" +checksum = "10929f201279ba14da3297b957dcda1e0bf7a6f3bb5115688be684aa8864e9cc" dependencies = [ "doc-comment", "liquid-core", @@ -3122,12 +3220,12 @@ dependencies = [ [[package]] name = "liquid-core" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e0724dfcaad5cfb7965ea0f178ca0870b8d7315178f4a7179f5696f7f04d5f" +checksum = "3aef4b2160791f456eb880c990a97746f693746f92302ef5f1d06111cf14b768" dependencies = [ "anymap2", - "itertools 0.10.5", + "itertools 0.12.1", "kstring", "liquid-derive", "num-traits", @@ -3140,9 +3238,9 @@ dependencies = [ [[package]] name = "liquid-derive" -version = "0.26.4" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" +checksum = "915f6d0a2963a27cd5205c1902f32ddfe3bc035816afd268cf88c0fc0f8d287e" dependencies = [ "proc-macro2", "quote", @@ -3151,11 +3249,11 @@ dependencies = [ [[package]] name = "liquid-lib" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a17e273a6fb1fb6268f7a5867ddfd0bd4683c7e19b51084f3d567fad4348c0" +checksum = "73f48fc446873f74d869582f5c4b8cbf3248c93395e410a67af5809b3731e44a" dependencies = [ - "itertools 0.10.5", + "itertools 0.12.1", "liquid-core", "once_cell", "percent-encoding", @@ -3164,17 +3262,11 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "litemap" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" - [[package]] name = "lmdb-master-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5142795c220effa4c8f4813537bd4c88113a07e45e93100ccb2adc5cec6c7f3" +checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" dependencies = [ "cc", "doxygen-rs", @@ -3209,12 +3301,28 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "macro_rules_attribute" version = "0.2.0" @@ -3257,7 +3365,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "md5", @@ -3266,17 +3374,14 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-cors", "actix-http", "actix-rt", "actix-utils", "actix-web", - "actix-web-static-files", "anyhow", - "assert-json-diff", - "async-stream", "async-trait", "brotli", "bstr", @@ -3295,12 +3400,11 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.11", "index-scheduler", "indexmap", "insta", "is-terminal", - "itertools 0.11.0", + "itertools 0.13.0", "jsonwebtoken", "lazy_static", "manifest-dir-macros", @@ -3323,15 +3427,17 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.21.12", + "roaring", + "rustls", "rustls-pemfile", + "rustls-pki-types", "segment", "serde", "serde_json", "serde_urlencoded", "sha-1", "sha2", - "siphasher 1.0.0", + "siphasher 1.0.1", "slice-group-by", "static-files", "sysinfo", @@ -3342,7 +3448,6 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-stream", "toml", "tracing", "tracing-actix-web", @@ -3351,16 +3456,16 @@ dependencies = [ "url", "urlencoding", "uuid", - "walkdir", + "wiremock", "yaup", - "zip", + "zip 2.1.3", ] [[package]] name = "meilisearch-auth" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "enum-iterator", "hmac", "maplit", @@ -3377,7 +3482,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-web", "anyhow", @@ -3391,7 +3496,7 @@ dependencies = [ "fst", "insta", "meili-snap", - "memmap2 0.7.1", + "memmap2", "milli", "roaring", "serde", @@ -3407,7 +3512,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "clap", @@ -3421,18 +3526,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3446,7 +3542,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arroy", "big_s", @@ -3474,21 +3570,23 @@ dependencies = [ "hf-hub", "indexmap", "insta", - "itertools 0.11.0", + "itertools 0.13.0", "json-depth-checker", "levenshtein_automata", "liquid", "maplit", "md5", "meili-snap", - "memmap2 0.7.1", + "memchr", + "memmap2", "mimalloc", "obkv", "once_cell", "ordered-float", "rand", - "rand_pcg", "rayon", + "rayon-par-bridge", + "rhai", "roaring", "rstar", "serde", @@ -3510,9 +3608,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -3684,6 +3782,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "num_threads" version = "0.1.7" @@ -3710,9 +3829,9 @@ dependencies = [ [[package]] name = "obkv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" +checksum = "a2e27bcfe835a379d32352112f6b8dbae2d99d16a5fff42abe6e5ba5386c1e5a" [[package]] name = "once_cell" @@ -3756,9 +3875,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" dependencies = [ "num-traits", ] @@ -3775,16 +3894,6 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -[[package]] -name = "page_size" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "page_size" version = "0.6.0" @@ -3797,9 +3906,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3818,17 +3927,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -3852,22 +3950,14 @@ checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.3" @@ -3886,7 +3976,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.9.0" +version = "1.10.2" dependencies = [ "big_s", "serde_json", @@ -4010,9 +4100,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4087,6 +4177,15 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.0", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4122,22 +4221,32 @@ dependencies = [ [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.6.0", "hex", "lazy_static", - "rustix 0.36.16", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.6.0", + "hex", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -4156,6 +4265,26 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "pulp" version = "0.18.9" @@ -4168,6 +4297,53 @@ dependencies = [ "reborrow", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.5", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -4177,6 +4353,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" @@ -4217,16 +4399,6 @@ dependencies = [ "rand", ] -[[package]] -name = "rand_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core", - "serde", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -4267,6 +4439,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rayon-par-bridge" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6a14d8f65834aca6b0fe4cbbd7a27e639cd3efb1f2a32de9942368f1991de8" +dependencies = [ + "rayon", +] + [[package]] name = "reborrow" version = "0.5.5" @@ -4304,9 +4485,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -4327,9 +4508,9 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -4338,21 +4519,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "reqwest" -version = "0.11.23" +name = "rend" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ - "base64 0.21.7", + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.11", + "http 1.1.0", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4360,12 +4551,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", + "quinn", + "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-util", @@ -4375,10 +4568,39 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots", "winreg", ] +[[package]] +name = "rhai" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "instant", + "num-traits", + "once_cell", + "rhai_codegen", + "serde", + "smallvec", + "smartstring", + "thin-vec", +] + +[[package]] +name = "rhai_codegen" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "ring" version = "0.17.8" @@ -4395,10 +4617,39 @@ dependencies = [ ] [[package]] -name = "roaring" -version = "0.10.5" +name = "rkyv" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "roaring" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" dependencies = [ "bytemuck", "byteorder", @@ -4407,9 +4658,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" dependencies = [ "heapless", "num-traits", @@ -4417,6 +4668,22 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -4438,89 +4705,55 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.36.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - [[package]] name = "rustix" version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki", "subtle", "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -4529,9 +4762,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -4565,20 +4798,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "segment" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" +checksum = "5bdca318192c89bb31bffa2ef8e9e9898bc80f15a78db2fdd41cd051f1b41d01" dependencies = [ "async-trait", "reqwest", @@ -4605,9 +4834,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -4623,9 +4852,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4634,9 +4863,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap", "itoa", @@ -4655,9 +4884,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4731,6 +4960,18 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +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 = "similar" version = "2.2.1" @@ -4757,9 +4998,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -4788,9 +5029,12 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -4799,6 +5043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ "autocfg", + "serde", "static_assertions", "version_check", ] @@ -4839,9 +5084,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spm_precompiled" @@ -4863,9 +5105,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "static-files" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" +checksum = "4e8590e848e1c53be9258210bcd4a8f4118e08988f03a4e2d63b62e4ad9f7ced" dependencies = [ "change-detection", "mime_guess", @@ -4905,7 +5147,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4940,6 +5182,24 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synchronoise" version = "1.0.1" @@ -4966,7 +5226,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -4976,9 +5236,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4990,31 +5250,16 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" +name = "tap" +version = "1.0.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", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -5038,7 +5283,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.31", + "rustix", "windows-sys 0.52.0", ] @@ -5051,6 +5296,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" +dependencies = [ + "serde", +] + [[package]] name = "thiserror" version = "1.0.61" @@ -5083,14 +5337,14 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" dependencies = [ "anyhow", "base64 0.21.7", "bstr", - "fancy-regex", + "fancy-regex 0.12.0", "lazy_static", "parking_lot", "rustc-hash", @@ -5129,6 +5383,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -5186,9 +5449,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5205,9 +5468,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -5216,56 +5479,45 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", + "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.15", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -5275,14 +5527,46 @@ name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5419,9 +5703,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unescaper" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" +checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" dependencies = [ "thiserror", ] @@ -5497,29 +5781,28 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.4", + "rustls", "rustls-pki-types", - "rustls-webpki 0.102.2", "serde", "serde_json", "socks", "url", - "webpki-roots 0.26.1", + "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5547,11 +5830,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "atomic", "getrandom", "serde", ] @@ -5570,25 +5852,24 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "9.0.0-beta.2" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107dc53b443fe8cc380798abb75ad6b7038281165109afea1f1b28bb47047ed5" +checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" dependencies = [ "anyhow", - "derive_builder 0.13.1", - "getset", + "derive_builder 0.20.0", "rustversion", "vergen-lib", ] [[package]] name = "vergen-git2" -version = "1.0.0-beta.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8875c5d71074bb67118774e3d795ab6fe77c3ae3161cb54e19104cabc49487f1" +checksum = "a62c52cd2b2b8b7ec75fc20111b3022ac3ff83e4fc14b9497cfcfd39c54f9c67" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "git2", "rustversion", "time", @@ -5598,12 +5879,12 @@ dependencies = [ [[package]] name = "vergen-lib" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ebfba72ba904559f25f41ea1512335b5a46459084258cea0857549d9645187" +checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "getset", "rustversion", ] @@ -5718,9 +5999,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5739,12 +6020,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - [[package]] name = "webpki-roots" version = "0.26.1" @@ -5760,7 +6035,7 @@ version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown", + "hashbrown 0.14.3", "once_cell", ] @@ -6022,27 +6297,71 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "xattr" -version = "1.0.1" +name = "wiremock" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http 1.1.0", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xtask" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "build-info", @@ -6069,23 +6388,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yaup" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a59e7d27bed43f7c37c25df5192ea9d435a8092a902e02203359ac9ce3e429d9" +checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ + "form_urlencoded", "serde", - "url", + "thiserror", ] [[package]] @@ -6155,55 +6466,97 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] [[package]] -name = "zerovec" -version = "0.10.1" +name = "zeroize_derive" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "zerofrom", + "proc-macro2", + "quote", + "syn 2.0.60", ] [[package]] name = "zip" -version = "0.6.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zip" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ - "libc", "zstd-sys", ] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index a58af212b20a..9d83354b6d32 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.9.0"; + version = "1.10.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,14 +20,9 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-fPXhayS8OKiiiDvVvBry3njZ74/W6oVL0p85Z5qf3KA=="; + hash = "sha256-gI0Azbb4gYFf4E/oIoJbln/mkbJIenSPzGUVliGzOzE="; }; - cargoPatches = [ - # fix build with Rust 1.80 - ./time-crate.patch - ]; - cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = { diff --git a/pkgs/servers/search/meilisearch/time-crate.patch b/pkgs/servers/search/meilisearch/time-crate.patch deleted file mode 100644 index b0b81f65026d..000000000000 --- a/pkgs/servers/search/meilisearch/time-crate.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3c728f348..51df0ea7b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -5098,9 +5098,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -5121,9 +5121,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", From 3af7e9a4c4f5f94fd05173214388de3bd63a1596 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Sat, 19 Oct 2024 14:26:46 +0200 Subject: [PATCH 65/71] meilisearch: add bbenno as maintainer --- pkgs/servers/search/meilisearch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9d83354b6d32..a7e8c7f8cbc0 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -59,7 +59,10 @@ rustPlatform.buildRustPackage { homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ happysalada ]; + maintainers = with lib.maintainers; [ + happysalada + bbenno + ]; platforms = [ "aarch64-linux" "aarch64-darwin" From 6066650cb46fd24368506d558b354040a3ad3042 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Thu, 18 Jul 2024 15:12:58 +0300 Subject: [PATCH 66/71] dut: init at 0-unstable-2024-07-31 --- pkgs/by-name/du/dut/package.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/du/dut/package.nix diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix new file mode 100644 index 000000000000..9557adfbe5a5 --- /dev/null +++ b/pkgs/by-name/du/dut/package.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + fetchFromGitea, +}: + +stdenv.mkDerivation { + pname = "dut"; + version = "0-unstable-2024-07-31"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "201984"; + repo = "dut"; + rev = "041c6f26162c2286776fac246ddbda312da1563d"; + hash = "sha256-YrBV5rG9rASI/5pwG3kcHoOvXBHhLJHvFFrvNhmGq2Y="; + }; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = { + platforms = lib.platforms.all; + broken = stdenv.isDarwin; + description = "A disk usage calculator for Linux"; + homepage = "https://codeberg.org/201984/dut"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "dut"; + }; +} From 3c1d64dade2ab7469b96c429d256ce264aba444a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 12:37:15 +0000 Subject: [PATCH 67/71] python312Packages.pypoint: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/pypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index d7062da6c80b..c144811f9a03 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pypoint"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; - rev = "v${version}"; - hash = "sha256-Ri+vf/vnjQQ+9eZ1Gzt+v68FAxVGt0IY9S3SpeVem3A="; + rev = "refs/tags/v${version}"; + hash = "sha256-9z9VcY42uHIksIvDU1Vz+kvXNmrCu08fGB/waQahmyg="; }; build-system = [ setuptools ]; From ec6950e63a7400ff86847d9a2cb2a33a0b34325e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 27 Sep 2024 11:40:39 +0200 Subject: [PATCH 68/71] tcl-9_0: init --- pkgs/development/interpreters/tcl/9.0.nix | 16 ++++++++++++ pkgs/development/interpreters/tcl/generic.nix | 26 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/tcl/9.0.nix diff --git a/pkgs/development/interpreters/tcl/9.0.nix b/pkgs/development/interpreters/tcl/9.0.nix new file mode 100644 index 000000000000..48a9570675a1 --- /dev/null +++ b/pkgs/development/interpreters/tcl/9.0.nix @@ -0,0 +1,16 @@ +{ callPackage, fetchzip, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + release = "9.0"; + version = "${release}.0"; + + # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated! + + src = fetchzip { + url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; + sha256 = "sha256-QaPSY6kfxyc3x+2ptzEmN2puZ0gSFSeeNjPuxsVKXYE="; + }; + } +) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 5df6fb28a304..7746034c357d 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, makeSetupHook, runCommand -, tzdata +, tzdata, zip, zlib # Version specific stuff , release, version, src @@ -24,17 +24,39 @@ let --replace "/usr/local/etc/zoneinfo" "" ''; + nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + + buildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + zlib + ]; + preConfigure = '' cd unix ''; - configureFlags = [ + # Note: pre-9.0 flags are temporarily interspersed to avoid a mass rebuild. + configureFlags = lib.optionals (lib.versionOlder version "9.0") [ "--enable-threads" + ] ++ [ # Note: using $out instead of $man to prevent a runtime dependency on $man. "--mandir=${placeholder "out"}/share/man" + ] ++ lib.optionals (lib.versionOlder version "9.0") [ "--enable-man-symlinks" # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" + ] ++ lib.optionals (lib.versionAtLeast version "9.0") [ + # By default, tcl libraries get zipped and embedded into libtcl*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs" + ] ++ [ "tcl_cv_strtod_unbroken=ok" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4e0b8b7236..26bab338401a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16619,6 +16619,7 @@ with pkgs; tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { }; tclreadline = callPackage ../development/interpreters/tclreadline { }; From 291d0cdc27a226c72a1903b9e6482b4767f27361 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 27 Sep 2024 11:41:39 +0200 Subject: [PATCH 69/71] tk-9_0: init --- pkgs/development/libraries/tk/9.0.nix | 23 +++++++++++++++++++++ pkgs/development/libraries/tk/generic.nix | 25 ++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/tk/9.0.nix diff --git a/pkgs/development/libraries/tk/9.0.nix b/pkgs/development/libraries/tk/9.0.nix new file mode 100644 index 000000000000..ff99ca8b4f63 --- /dev/null +++ b/pkgs/development/libraries/tk/9.0.nix @@ -0,0 +1,23 @@ +{ + callPackage, + fetchzip, + tcl, + ... +}@args: + +callPackage ./generic.nix ( + args + // { + + src = fetchzip { + url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; + sha256 = "sha256-jQ9kZuFx6ikQ+SpY7kSbvXJ5hjw4WB9VgRaNlQLtG0s="; + }; + + patches = [ + # https://core.tcl-lang.org/tk/tktview/765642ffffffffffffff + ./tk-8_6_13-find-library.patch + ]; + + } +) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 8094ed169fa3..7a4b0a76d3b4 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] , enableAqua ? stdenv.hostPlatform.isDarwin, darwin , ... }: @@ -39,9 +39,26 @@ tcl.mkTclDerivation { configureFlags = [ "--enable-threads" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" - ++ lib.optional enableAqua "--enable-aqua"; + ++ lib.optional enableAqua "--enable-aqua" + ++ lib.optional (lib.versionAtLeast tcl.version "9.0") + # By default, tk libraries get zipped and embedded into libtcl9tk*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + buildInputs = lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + zlib + ]; propagatedBuildInputs = [ libXft @@ -69,5 +86,7 @@ tcl.mkTclDerivation { license = licenses.tcltk; platforms = platforms.all; maintainers = [ ]; + broken = stdenv.hostPlatform.isDarwin + && lib.elem (lib.versions.majorMinor tcl.version) ["8.5" "9.0"]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26bab338401a..26cb83569c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23277,6 +23277,7 @@ with pkgs; tk = tk-8_6; + tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; }; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; From 52942d8d48ebbc3d1bc5bb7a3bcceec34ae8dd6d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 5 Oct 2024 16:59:04 +0800 Subject: [PATCH 70/71] hashes: init at 1.1.0 --- pkgs/by-name/ha/hashes/package.nix | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/ha/hashes/package.nix diff --git a/pkgs/by-name/ha/hashes/package.nix b/pkgs/by-name/ha/hashes/package.nix new file mode 100644 index 000000000000..a1937d82f5b7 --- /dev/null +++ b/pkgs/by-name/ha/hashes/package.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + adwaita-icon-theme, + gtk4, + libadwaita, + desktop-file-utils, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + cmake, + python3Packages, + appstream, + fetchPypi, + gobject-introspection, + glib, +}: + +python3Packages.buildPythonApplication rec { + pname = "hashes"; + version = "1.1.0"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "zefr0x"; + repo = "hashes"; + rev = "refs/tags/v${version}"; + hash = "sha256-BmfSCHs+JcpsAG8AhaYf+SDFI+LdJKMKgBIodd66qmw="; + }; + + nativeBuildInputs = [ + meson + ninja + desktop-file-utils + cmake + pkg-config + appstream + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + glib + adwaita-icon-theme + ]; + + dependencies = with python3Packages; [ + name-that-hash + pygobject3 + ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/zefr0x/hashes/tree/main"; + changelog = "https://github.com/zefr0x/hashes/releases/tag/v${version}"; + description = "Simple hash algorithm identification GUI"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Plus; + mainProgram = "hashes"; + platforms = lib.platforms.unix; + }; +} From 35c38039443a6f02b9effd35ef9db3f69bc43bc7 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 23 Aug 2024 18:15:21 +0200 Subject: [PATCH 71/71] sscep: init at 0.10.0 --- pkgs/by-name/ss/sscep/package.nix | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ss/sscep/package.nix diff --git a/pkgs/by-name/ss/sscep/package.nix b/pkgs/by-name/ss/sscep/package.nix new file mode 100644 index 000000000000..52e97fe18f7e --- /dev/null +++ b/pkgs/by-name/ss/sscep/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + openssl, + autoreconfHook, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sscep"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "certnanny"; + repo = "sscep"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wlxQONOCLPuNdI6AyMJoLP09cs+ak7Jv9idhXTT5RWA="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Client-only implementation of the SCEP (Cisco System's Simple Certificate Enrollment Protocol)"; + homepage = "https://github.com/certnanny/sscep"; + maintainers = [ lib.maintainers.stv0g ]; + license = [ + lib.licenses.bsd2 + lib.licenses.openssl + ]; + platforms = lib.platforms.all; + }; +})