From 0407dd70a52da26d8ba5bb9600c7be1da1f9c8bd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 18 Nov 2023 12:01:55 +0100 Subject: [PATCH 001/132] inhibridge: init at 0.3.0 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/in/inhibridge/package.nix | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/in/inhibridge/package.nix diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix new file mode 100644 index 000000000000..4340d4a3e869 --- /dev/null +++ b/pkgs/by-name/in/inhibridge/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: +rustPlatform.buildRustPackage rec { + pname = "inhibridge"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Scrumplex"; + repo = "inhibridge"; + rev = version; + hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM="; + }; + + cargoHash = "sha256-uKSbxAsGUR2nYfdtiTR/bgPBQunqYLzx3+CmszNilPQ="; + + meta = with lib; { + homepage = "https://codeberg.org/Scrumplex/inhibridge"; + description = "Simple daemon that bridges freedesktop.org ScreenSaver inhibitions to systemd-inhibit"; + platforms = platforms.linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [Scrumplex]; + mainProgram = "inhibridge"; + }; +} + From 8d1de5a49464fe93087e7126626fde60d5561dab Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:43:29 +0200 Subject: [PATCH 002/132] lensfun: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/development/libraries/lensfun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 766a1161e2c6..8972485bb282 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { buildInputs = [ glib zlib libpng ]; - cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" "-DCMAKE_BUILD_TYPE=RELEASE" ]; + cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; meta = with lib; { platforms = platforms.linux ++ platforms.darwin; From c9a5df08f56e96d8b1467dc1423998db94542b3e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:45:44 +0200 Subject: [PATCH 003/132] widelands: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/games/widelands/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 11e6db9c687e..c2d7e48e456d 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" # dev warnings are only needed for upstream development - "-DCMAKE_BUILD_TYPE=Release" "-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc. "-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data "-DWL_INSTALL_BINDIR=${placeholder "out"}/bin" From 688649def33bd686f86bcaf9c1053e41b69b5e61 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:52:18 +0200 Subject: [PATCH 004/132] xeus-cling: remove CMAKE_BUILD_TYPE from cmakeFlags --- .../editors/jupyter-kernels/xeus-cling/xeus-cling.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index ec1def846977..b944569ff4a7 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -68,9 +68,7 @@ clangStdenv.mkDerivation rec { zlib ]; - cmakeFlags = lib.optionals debug [ - "-DCMAKE_BUILD_TYPE=Debug" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; postPatch = '' substituteInPlace src/xmagics/executable.cpp \ From c847ef8d75e35f476fde3f994e5cd8a251e6ce82 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:54:29 +0200 Subject: [PATCH 005/132] qgis: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/applications/gis/qgis/unwrapped.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index d7c743e36a53..b61130d8f1ff 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -152,7 +152,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" From 1271a3b6d5550d191a049727f55c5649b7988ffc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:55:04 +0200 Subject: [PATCH 006/132] qgis-ltr: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8b47329cd4a2..8d31e58f4051 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -151,7 +151,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" From ee4483f188bcb71b9ccbf56139d32b892bcdaa56 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:57:24 +0200 Subject: [PATCH 007/132] maa-assistant-arknights: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix | 3 ++- pkgs/by-name/ma/maa-assistant-arknights/package.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 98ab599b9ddc..22a6e30a4151 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -54,9 +54,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ); + cmakeBuildType = "None"; + cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 27ef0e428cc5..b2c720f83551 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -57,13 +57,14 @@ in ] ); + cmakeBuildType = "None"; + cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" true) (lib.cmakeBool "INSTALL_FLATTEN" false) (lib.cmakeBool "INSTALL_PYTHON" true) (lib.cmakeBool "INSTALL_RESOURCE" true) (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None") (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") ]; From 72734ed79359bcb3f985960bce89ecba0ee55a90 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:58:32 +0200 Subject: [PATCH 008/132] manifold: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/ma/manifold/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 822feef1debf..630a7292bd66 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" "-DMANIFOLD_TEST=ON" "-DMANIFOLD_PAR=TBB" From 42f5757eed89f6c940150f12d6b3e91b599bacee Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 18:59:28 +0200 Subject: [PATCH 009/132] opengv: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/op/opengv/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix index a0025a29dba7..23b1b7e1d83d 100644 --- a/pkgs/by-name/op/opengv/package.nix +++ b/pkgs/by-name/op/opengv/package.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { eigen ]; - cmakeFlakes = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - meta = { description = "Collection of computer vision methods for solving geometric vision problems"; homepage = "https://github.com/laurentkneip/opengv"; From 1a2360f0b4bce5e8aed9a03deda413f0208b3ba8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:00:24 +0200 Subject: [PATCH 010/132] cro-mag-rally: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/cr/cro-mag-rally/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/cr/cro-mag-rally/package.nix b/pkgs/by-name/cr/cro-mag-rally/package.nix index 781ddad7fd05..93ca67f0a86a 100644 --- a/pkgs/by-name/cr/cro-mag-rally/package.nix +++ b/pkgs/by-name/cr/cro-mag-rally/package.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/share/CroMagRally" From e5cfcd2b3ec33acac46fb6fb767c05f3cfa2266f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:01:11 +0200 Subject: [PATCH 011/132] httping: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/ht/httping/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix index 85fcc843ef0f..ee302e640413 100644 --- a/pkgs/by-name/ht/httping/package.nix +++ b/pkgs/by-name/ht/httping/package.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - ]; - installPhase = '' runHook preInstall install -D httping $out/bin/httping From 4b84d3dfec38506162973c0f318d5a407d9ef101 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:02:50 +0200 Subject: [PATCH 012/132] ricochet-refresh: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/ri/ricochet-refresh/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 8bbc781bb4f5..99ebaff5a1cd 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + cmakeBuildType = "MinSizeRel"; + # https://github.com/blueprint-freespeech/ricochet-refresh/blob/main/BUILDING.md cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "MinSizeRel") (lib.cmakeBool "RICOCHET_REFRESH_INSTALL_DESKTOP" true) (lib.cmakeBool "USE_SUBMODULE_FMT" true) ]; From 53f550bbfd8f116027c97dc17876cce903fb21f9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:06:14 +0200 Subject: [PATCH 013/132] protonmail-bridge-gui: use cmakeFlags instead of preConfigure also remove CMAKE_BUILD_TYPE from cmakeFlags --- .../pr/protonmail-bridge-gui/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 2b15e67908d4..3cb289b61426 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -62,17 +62,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i "/add_subdirectory(bridge-gui-tester)/d" CMakeLists.txt ''; - preConfigure = '' - cmakeFlagsArray+=( - "-DCMAKE_BUILD_TYPE=Release" - "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" - "-DBRIDGE_VENDOR=Proton AG" - "-DBRIDGE_REVISION=${finalAttrs.src.rev}" - "-DBRIDGE_TAG=${finalAttrs.version}" - "-DBRIDGE_BUILD_ENV=Nix" - "-DBRIDGE_APP_VERSION=${finalAttrs.version}" - ) - ''; + cmakeFlags = [ + "-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge" + "-DBRIDGE_VENDOR=Proton AG" + "-DBRIDGE_REVISION=${finalAttrs.src.rev}" + "-DBRIDGE_TAG=${finalAttrs.version}" + "-DBRIDGE_BUILD_ENV=Nix" + "-DBRIDGE_APP_VERSION=${finalAttrs.version}" + ]; installPhase = '' runHook preInstall From 81cd98b0b50d16a210cf3b7e119ea939c2f7c128 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:07:47 +0200 Subject: [PATCH 014/132] clang-uml: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/cl/clang-uml/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index ec1f03499619..6bc82b7c07bf 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { yaml-cpp ]; - cmakeFlags = if debug then [ "-DCMAKE_BUILD_TYPE=Debug" ] else [ ]; + cmakeBuildType = if debug then "Debug" else "Release"; clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; From 71402a672f19385ad9cb2eb22c6a5834a9ca770a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:08:27 +0200 Subject: [PATCH 015/132] rsgain: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/rs/rsgain/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index 2a8fa32ec554..16ba4252dd71 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-kTvIMsRI99U2ovkN5pC4OUS/bJWpRYSuRcvObvQRnbQ="; }; - cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"]; - nativeBuildInputs = [pkg-config cmake]; buildInputs = [libebur128 taglib ffmpeg inih fmt zlib]; From 07654aeb367723490443858e33bfc698936cbc83 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:08:59 +0200 Subject: [PATCH 016/132] raze: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/ra/raze/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix index 8739aa1108a1..e761cdce6e7c 100644 --- a/pkgs/by-name/ra/raze/package.nix +++ b/pkgs/by-name/ra/raze/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeBool "DYN_GTK" false) (lib.cmakeBool "DYN_OPENAL" false) ]; From 2277260e75b4eedf25c062ce8e655444c52b7382 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:09:31 +0200 Subject: [PATCH 017/132] lms: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/lm/lms/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 778414a5db32..04dfb80d5759 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" From 2ab92557c1b0bb84e22b3dccd288fef41dd65180 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:10:19 +0200 Subject: [PATCH 018/132] libvpl: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/li/libvpl/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index ad155189f74d..e4fb7e0180ab 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DENABLE_DRI3=ON" "-DENABLE_DRM=ON" "-DENABLE_VA=ON" From e41451febf8662e36e70180a78708558e4d1e438 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:11:39 +0200 Subject: [PATCH 019/132] qdiskinfo: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/qd/qdiskinfo/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 5105e6c30a1c..736a6e09c1b2 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { smartmontools ]; + cmakeBuildType = "MinSizeRel"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE:STRING=MinSizeRel" "-DQT_VERSION_MAJOR=6" ]; From 7194cfcbc69e2dd38c05b1eba5ac7e6ea0be508e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 23 Aug 2024 19:14:42 +0200 Subject: [PATCH 020/132] _2ship2harkinian: remove CMAKE_BUILD_TYPE from cmakeFlags --- pkgs/by-name/_2/_2ship2harkinian/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 2af660495cdd..90899330ea3d 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -138,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") From fdc712da63a5c70013810098572dec54c705be05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 Sep 2024 16:27:01 +0200 Subject: [PATCH 021/132] betterbird: 115.9.0-bb26-build2 -> 115.14.0-bb31 --- .../networking/mailreaders/betterbird/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index b62b30ae60b3..b479a01d0d4c 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.9.0"; + version = "115.14.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb26-build2"; + rev = "${version}-bb31"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w="; + hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -50,7 +50,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc="; + hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -79,7 +79,8 @@ in ((buildMozillaMach { fi # requires vendored icu, fails to link with our icu - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then + # feature-506064 depends on those icu patches + if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then continue fi From c9360770fea142a33ef7c9131aee8d2b0c4b0f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 Sep 2024 16:51:46 +0200 Subject: [PATCH 022/132] ArchiSteamFarm: 6.0.4.4 -> 6.0.6.4 Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.0.6.4 --- .../misc/ArchiSteamFarm/default.nix | 4 +- .../applications/misc/ArchiSteamFarm/deps.nix | 55 +++++++++---------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index bc2b92843c36..a218ef04c56b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.4.4"; + version = "6.0.6.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw="; + hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 170e10fbeb01..d33bed6722a4 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -4,7 +4,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; }) (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; }) @@ -58,10 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) @@ -78,54 +78,49 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) - (fetchNuGet { pname = "MSTest"; version = "3.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) + (fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; }) (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.9.0-beta.2"; hash = "sha256-zV4sKZ3v2uSPPy0HLbAE6XwGt6r8R5UVdFJ/tVDiKWg="; }) (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; }) (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) - (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index b1da7708bfe9..8231e831b4fe 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "3ae4df4206a3f5fbbe582403403df848fd29847f"; + version = "1641151b9f430908bc63bbe9927fa8414538e7f1"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s="; + hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I="; }; - npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4="; + npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg="; installPhase = '' runHook preInstall From 99d636490f81e5024077b7e234871a06f5fe7451 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Fri, 6 Sep 2024 12:23:50 +0000 Subject: [PATCH 023/132] zsh-forgit: 24.02.0 -> 24.09.0 --- pkgs/shells/zsh/zsh-forgit/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 13038e05c709..0ace44e06f9d 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -1,32 +1,33 @@ -{ stdenv +{ stdenvNoCC , lib , bash , coreutils , findutils , fetchFromGitHub , fzf +, gawk , git , gnugrep , gnused , makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.02.0"; + version = "24.09.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; - rev = version; - sha256 = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; }; strictDeps = true; postPatch = '' substituteInPlace forgit.plugin.zsh \ - --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" + --replace-fail "\$FORGIT_INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" ''; dontBuild = true; @@ -38,10 +39,9 @@ stdenv.mkDerivation rec { install -D bin/git-forgit $out/bin/git-forgit install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit - install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh - install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ - --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf gawk git gnugrep gnused ]} runHook postInstall ''; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; }; -} +}) From c27e90ce58df36fd047b86a8b73109626fdf215f Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sat, 7 Sep 2024 19:11:32 -0300 Subject: [PATCH 024/132] lime3ds: 2117.1 -> 2118 --- pkgs/by-name/li/lime3ds/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 62c70f5b69f6..5e57360baa38 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -42,11 +42,11 @@ inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2117.1"; + version = "2118"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4="; + hash = "sha256-Dt0YKWj+yLUic1F7uOxfWPYlPda3snTUPwFbn23i2rY="; }; nativeBuildInputs = [ @@ -110,7 +110,7 @@ in stdenv.mkDerivation (finalAttrs: { postInstall = let libs = makeLibraryPath [ vulkan-loader ]; in optionalString enableSdl2Frontend '' - for binfile in lime3ds-gui lime3ds-cli lime3ds-room + for binfile in lime3ds lime3ds-room do wrapProgram "$out/bin/$binfile" \ --prefix LD_LIBRARY_PATH : ${libs} @@ -122,17 +122,19 @@ in stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false) (cmakeBool "USE_SYSTEM_LIBS" true) (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ] ++ optionals enableQt [ + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) ]; meta = { @@ -140,7 +142,7 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Lime3DS/Lime3DS"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; + mainProgram = "lime3ds"; platforms = lib.platforms.linux; }; }) From bde8bfd131bbb61f5339fd5898099afbb2f88c73 Mon Sep 17 00:00:00 2001 From: DataHearth Date: Mon, 9 Sep 2024 13:32:15 +0200 Subject: [PATCH 025/132] hoppscotch: 24.3.3-1 -> 24.8.1-0 --- pkgs/by-name/ho/hoppscotch/package.nix | 120 ++++++++++++++----------- 1 file changed, 70 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index a798f05c7ef4..c37211ee91a0 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -1,30 +1,35 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, undmg +{ + lib, + stdenv, + fetchurl, + appimageTools, + undmg, + copyDesktopItems, }: let pname = "hoppscotch"; - version = "24.3.3-1"; + version = "24.8.1-0"; - src = fetchurl { - aarch64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-litOYRsUOx6VpkA1LPx7aGGagqIVL9fgNsYoP5n/2mo="; - }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-UG89Fv9J8SnzPVoIO16LOprxPmZuu/zyox1b+jn+eNw="; - }; - x86_64-linux = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-110l1DTyvH2M0ex1r35Q+55NiJ8nYum1KdWQXDvAdxo="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + aarch64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-Tc6lQbMZHX4Wl0R3fGClRr27fFTrYTxMtAkSPCw8mrw="; + }; + x86_64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; + hash = "sha256-c3UHntrLRoXfmz8LL3Xu8mjBtyf952/tYMFqbTyECR0="; + }; + x86_64-linux = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-Aegc4kiLPtY+hlQtfYR3uztqs8Gj9fbUcAZ1XB8i1Pw="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - meta = with lib; { + meta = { description = "Open source API development ecosystem"; longDescription = '' Hoppscotch is a lightweight, web-based API development suite. It was built @@ -34,41 +39,56 @@ let ''; homepage = "https://hoppscotch.com"; downloadPage = "https://hoppscotch.com/downloads"; - changelog = "https://hoppscotch.com/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ DataHearth ]; + changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/2024.8.1"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; mainProgram = "hoppscotch"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation -{ - inherit pname version src meta; +if stdenv.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ undmg ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv Hoppscotch.app $out/Applications/ + mkdir -p "$out/Applications" + mv Hoppscotch.app $out/Applications/ - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = - let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; - in - '' - # Install .desktop files - install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + runHook postInstall ''; -} + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Install .desktop files + install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + ''; + } From 9b6222cb716912d52103b4f7ef4c43112c54906d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 10 Sep 2024 19:00:18 +0200 Subject: [PATCH 026/132] dyalog: 19.0.49960 -> 19.0.50027 --- pkgs/by-name/dy/dyalog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 2655e5b95c7c..1833320dd13e 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -51,14 +51,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dyalog"; - version = "19.0.49960"; + version = "19.0.50027"; shortVersion = lib.versions.majorMinor finalAttrs.version; src = assert !acceptLicense -> throw licenseDisclaimer; fetchurl { url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb"; - hash = "sha256-WeIrwF6msiQGS6ltYWn6TN+v+aXK1cbJ1e11B6f0+2A="; + hash = "sha256-3uB102Hr0dmqAZj2ezLhsAdBotY24PWJfE7g5wSmKMA="; }; outputs = [ "out" ] ++ lib.optional enableDocs "doc"; From 19618599793f8fe0428d5843b667c7c89767e1e5 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 10 Sep 2024 19:33:22 +0800 Subject: [PATCH 027/132] overlayed: init at 0.5.0 --- pkgs/by-name/ov/overlayed/Cargo.lock | 5432 +++++++++++++++++++++++++ pkgs/by-name/ov/overlayed/package.nix | 70 + pkgs/by-name/ov/overlayed/webui.nix | 40 + 3 files changed, 5542 insertions(+) create mode 100644 pkgs/by-name/ov/overlayed/Cargo.lock create mode 100644 pkgs/by-name/ov/overlayed/package.nix create mode 100644 pkgs/by-name/ov/overlayed/webui.nix diff --git a/pkgs/by-name/ov/overlayed/Cargo.lock b/pkgs/by-name/ov/overlayed/Cargo.lock new file mode 100644 index 000000000000..ff8b531c03ac --- /dev/null +++ b/pkgs/by-name/ov/overlayed/Cargo.lock @@ -0,0 +1,5432 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-process" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" +dependencies = [ + "async-channel", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.5", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.68", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.68", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.14", + "vswhom", + "winreg 0.52.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.1", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.2", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.11", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "notify-rust" +version = "4.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus 4.3.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overlayed" +version = "0.0.0" +dependencies = [ + "anyhow", + "cocoa 0.25.0", + "objc", + "serde", + "tauri", + "tauri-build", + "tauri-nspanel", + "tauri-plugin-single-instance", + "tauri-plugin-websocket", + "tauri-plugin-window-state", + "tokio", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plist" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +dependencies = [ + "base64 0.21.7", + "indexmap 2.2.6", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[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.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "indexmap 2.2.6", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.11", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.6", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck 0.5.0", + "pkg-config", + "toml 0.8.14", + "version-compare 0.2.0", +] + +[[package]] +name = "tao" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement 0.39.0", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tauri" +version = "1.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cocoa 0.24.1", + "dirs-next", + "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "getrandom 0.2.15", + "glib", + "glob", + "gtk", + "heck 0.5.0", + "http 0.2.12", + "ico 0.2.0", + "ignore", + "indexmap 1.9.3", + "infer 0.9.0", + "minisign-verify", + "nix 0.26.4", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "percent-encoding", + "png", + "rand 0.8.5", + "raw-window-handle", + "regex", + "reqwest", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "sys-locale", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.5.0", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico 0.3.0", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-nspanel" +version = "0.0.0" +source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v1#9bf268429c8b0bebff0f5e63a18ab51b90c728de" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa 0.25.0", + "core-foundation", + "core-graphics 0.23.2", + "objc", + "objc-foundation", + "objc_id", + "tauri", +] + +[[package]] +name = "tauri-plugin-single-instance" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "windows-sys 0.52.0", + "zbus 3.15.2", +] + +[[package]] +name = "tauri-plugin-websocket" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51" +dependencies = [ + "futures-util", + "http 1.1.0", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "tauri", + "thiserror", + "tokio", + "tokio-tungstenite", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.1" +source = "git+https://github.com/Hacksore/plugins-workspace?branch=v1#ad0b46f5fb5dae87b9ef2db5bce640e10a096b6b" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +dependencies = [ + "gtk", + "http 0.2.12", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +dependencies = [ + "cocoa 0.24.1", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.5.0", + "html5ever", + "infer 0.13.0", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" +dependencies = [ + "quick-xml", + "windows 0.56.0", + "windows-version", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa 1.0.11", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +dependencies = [ + "getrandom 0.2.15", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.2", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement 0.39.0", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "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 = "wry" +version = "0.24.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa 0.24.1", + "core-graphics 0.22.3", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.12", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement 0.39.0", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", +] + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast 0.5.1", + "async-executor", + "async-fs 1.6.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process 1.8.1", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-process 2.2.3", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.3.0", + "zbus_names 3.0.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.1", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.1.1", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", + "zvariant_utils 2.0.0", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix new file mode 100644 index 000000000000..19452d768d5b --- /dev/null +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -0,0 +1,70 @@ +{ + rustPlatform, + lib, + callPackage, + pkg-config, + openssl, + libsoup, + webkitgtk, + fetchFromGitHub, + libayatana-appindicator, +}: + +rustPlatform.buildRustPackage rec { + pname = "overlayed"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "overlayeddev"; + repo = "overlayed"; + rev = "refs/tags/v${version}"; + hash = "sha256-yS1u7pp7SfmqzoH0QOAH060uo3nFb/N9VIng0T21tVw="; + }; + + sourceRoot = "${src.name}/apps/desktop/src-tauri"; + + webui = callPackage ./webui.nix { + inherit meta src version; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + webkitgtk + libsoup + ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-window-state-0.1.1" = "sha256-2cdO+5YAP7MOK0/YKclQemK4N9ci2JX3AfmMaeauwNI="; + "tauri-nspanel-0.0.0" = "sha256-tQHY0OX37b4dqhs89phYIzw7JzEPmMJo5e/jlyzxdMg="; + "tauri-plugin-single-instance-0.0.0" = "sha256-S1nsT/Dr0aIJdiPnW1FGamCth7CDMNAp4v34tpWqjHg="; + }; + }; + + postPatch = '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace ./tauri.conf.json \ + --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm build"' '"beforeBuildCommand": ""' + ''; + + meta = { + description = "Modern discord voice chat overlay"; + homepage = "https://github.com/overlayeddev/overlayed"; + changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${version}"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.agpl3Plus; + mainProgram = "overlayed"; + }; +} diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix new file mode 100644 index 000000000000..7105dc8eae74 --- /dev/null +++ b/pkgs/by-name/ov/overlayed/webui.nix @@ -0,0 +1,40 @@ +{ + src, + meta, + version, + stdenv, + nodejs, + pnpm, +}: + +stdenv.mkDerivation (finalAttrs: { + inherit version src meta; + pname = "overlayed-webui"; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) src pname version; + hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + cd apps/desktop + node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; +}) From e2594868c9e5a0c5dc54545388d7d3467df36d1a Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 12 Sep 2024 10:20:22 -0400 Subject: [PATCH 028/132] pokemmo-installer: init at 1.4.8 --- pkgs/by-name/po/pokemmo-installer/package.nix | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/po/pokemmo-installer/package.nix diff --git a/pkgs/by-name/po/pokemmo-installer/package.nix b/pkgs/by-name/po/pokemmo-installer/package.nix new file mode 100644 index 000000000000..a4adf5a8eba1 --- /dev/null +++ b/pkgs/by-name/po/pokemmo-installer/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + coreutils, + findutils, + gnugrep, + jre, + openssl, + util-linux, + wget, + which, + zenity, + libGL, + libpulseaudio, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pokemmo-installer"; + version = "1.4.8"; + + src = fetchFromGitLab { + owner = "coringao"; + repo = "pokemmo-installer"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-uSbnXBpkeGM9X6DU7AikT7hG/emu67PXuGdm6xfB8To="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + + # BINDIR defaults to $(PREFIX)/games + "BINDIR=${placeholder "out"}/bin" + ]; + + postFixup = '' + wrapProgram "$out/bin/pokemmo-installer" \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + gnugrep + jre + openssl + util-linux + wget + which + zenity + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libpulseaudio + ] + } + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Installer and Launcher for the PokeMMO emulator"; + homepage = "https://pokemmo.eu"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.linux; + mainProgram = "pokemmo-installer"; + }; +}) From 918e8d7bbbc56465f54e0b59eafc0150cf72d1bd Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 8 Sep 2024 20:54:50 -0300 Subject: [PATCH 029/132] kara: init at 0.7.1 --- pkgs/by-name/ka/kara/package.nix | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/ka/kara/package.nix diff --git a/pkgs/by-name/ka/kara/package.nix b/pkgs/by-name/ka/kara/package.nix new file mode 100644 index 000000000000..89789a0d891d --- /dev/null +++ b/pkgs/by-name/ka/kara/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + kdePackages, + ... +}: +stdenv.mkDerivation (finalAttrs: { + pname = "kara"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "dhruv8sh"; + repo = "kara"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp metadata.json $out/share/plasma/plasmoids/org.dhruv8sh.kara + cp -r contents $out/share/plasma/plasmoids/org.dhruv8sh.kara + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "KDE Plasma Applet for use as a desktop/workspace pager"; + homepage = "https://github.com/dhruv8sh/kara"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) From 0957c77918358adbb2f6062001d03895c77c93eb Mon Sep 17 00:00:00 2001 From: DataHearth Date: Fri, 13 Sep 2024 11:41:32 +0200 Subject: [PATCH 030/132] nosql-workbench: lint --- pkgs/by-name/no/nosql-workbench/package.nix | 118 ++++++++++++-------- 1 file changed, 69 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index e3d1890665a5..d2f329ca5faa 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -4,26 +4,29 @@ fetchurl, jdk21, stdenv, - _7zz + _7zz, }: let pname = "nosql-workbench"; version = "3.11.0"; - src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; - }; - aarch64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; - }; - x86_64-linux = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + x86_64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; + hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; + }; + aarch64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; + hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; + }; + x86_64-linux = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; + hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = { description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables"; @@ -31,49 +34,66 @@ let changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ DataHearth ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { - inherit pname version src meta; +if stdenv.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - # DMG file is using APFS which is unsupported by "undmg". - # Instead, use "7zz" to extract the contents. - # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 - nativeBuildInputs = [ _7zz ]; + # DMG file is using APFS which is unsupported by "undmg". + # Instead, use "7zz" to extract the contents. + # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 + nativeBuildInputs = [ _7zz ]; - buildInputs = [ jdk21 ]; + buildInputs = [ jdk21 ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv NoSQL\ Workbench.app $out/Applications/ + mkdir -p "$out/Applications" + mv NoSQL\ Workbench.app $out/Applications/ - runHook postInstall - ''; + runHook postInstall + ''; -} else appimageTools.wrapType2 { - inherit pname version src meta; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; - extraPkgs = pkgs: [ - # Required to run DynamoDB locally - pkgs.jdk21 - ]; + extraPkgs = pkgs: [ + # Required to run DynamoDB locally + pkgs.jdk21 + ]; - extraInstallCommands = let - appimageContents = appimageTools.extract { - inherit pname version src; - }; - in '' - # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + extraInstallCommands = + let + appimageContents = appimageTools.extract { inherit pname version src; }; + in + '' + # Install XDG Desktop file and its icon + install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps - # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' - ''; -} + # Replace wrong exec statement in XDG Desktop file + substituteInPlace $out/share/applications/nosql-workbench.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + ''; + } From a95073010f19fae349fa135799398d07129900ef Mon Sep 17 00:00:00 2001 From: DataHearth Date: Fri, 13 Sep 2024 11:56:06 +0200 Subject: [PATCH 031/132] nosql-workbench: 3.11.0 -> 3.13.0 --- pkgs/by-name/no/nosql-workbench/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index d2f329ca5faa..bc9532c58d94 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -8,22 +8,22 @@ }: let pname = "nosql-workbench"; - version = "3.11.0"; + version = "3.13.0"; src = fetchurl { x86_64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; + hash = "sha256-Dof1F1LTD478wh7jTR5zwFmbrvyCOWVO/C1QXTebi3c="; }; aarch64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; + hash = "sha256-QD0F6onP3GhMRIzNifx/RZkxPIS/GMtnF4zro5ygucg="; }; x86_64-linux = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; + hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -86,14 +86,15 @@ else extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; + internal_filename = "@amznnosql-workbench"; in '' # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/${internal_filename}.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/pixmaps # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + substituteInPlace $out/share/applications/${internal_filename}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' ''; } From be3cef9ecc55178922f972ca2c61434eb31fed81 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 9 Aug 2024 21:33:19 -0400 Subject: [PATCH 032/132] krane: 3.6.1 -> 3.6.2 --- .../networking/cluster/krane/Gemfile.lock | 37 +++++----- .../networking/cluster/krane/gemset.nix | 70 +++++++++---------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 7d780f0e9316..a1912256547d 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,36 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.8) colorize (0.8.1) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) domain_name (0.6.20240107) drb (2.2.1) ejson (1.4.1) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) googleauth (1.11.0) faraday (>= 1.0, < 3.a) @@ -46,7 +47,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) i18n (1.14.5) @@ -55,7 +56,7 @@ GEM multi_json jwt (2.8.2) base64 - krane (3.6.1) + krane (3.6.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -64,7 +65,7 @@ GEM jsonpath (~> 1.0) kubeclient (~> 4.9) multi_json - statsd-instrument (>= 2.8, < 4) + statsd-instrument (>= 2.8, < 3.9) thor (>= 1.0, < 2.0) kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -74,13 +75,12 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) - minitest (5.24.1) + mime-types-data (3.2024.0903) + minitest (5.25.1) multi_json (1.15.0) - mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -93,16 +93,17 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + securerandom (0.3.1) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.8.0) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (0.13.0) + uri (0.13.1) PLATFORMS ruby diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index e8bf7ffd7419..39b8783c3a53 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.4"; + version = "7.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -107,10 +107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; + sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -118,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.1"; + version = "3.3.0"; }; ffi = { groups = ["default"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i20j9wgxk4k47g54jiphb02xdhrwvadf4a0jjq5mzr1dwcx64vp"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; http-form_data = { groups = ["default"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002nf72l4b9h0lmpxzd5zm7dwakjs9f9cxrmkrx77qdyj4vy4g48"; + sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42"; type = "gem"; }; - version = "3.6.1"; + version = "3.6.2"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -300,20 +300,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzvh906sk9zqfd4bvpjjgw856i769d2abjp3cibh5w73r9g70zj"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "3.2024.0806"; + version = "3.2024.0903"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.1"; + version = "5.25.1"; }; multi_json = { groups = ["default"]; @@ -325,16 +325,6 @@ }; version = "1.15.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; net-http = { dependencies = ["uri"]; groups = ["default"]; @@ -407,6 +397,16 @@ }; version = "2.1.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -454,9 +454,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; } From 7830f27e1f22db771606993ca7dbc259d1ba9c3a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 16 Sep 2024 01:30:02 +0400 Subject: [PATCH 033/132] =?UTF-8?q?python312Packages.expecttest:=200.1.4?= =?UTF-8?q?=20=E2=86=92=200.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/expecttest/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index e9cdcf3f5745..0d52c20ba8f0 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -7,19 +7,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "expecttest"; - version = "0.1.4"; - format = "pyproject"; + version = "0.2.1"; + pyproject = true; src = fetchFromGitHub { - owner = "ezyang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-BFM0jFWXfH72n9XuFtU9URW8LWGPVJncXniBV5547W4="; + owner = "pytorch"; + repo = "expecttest"; + rev = "683b09a352cc426851adc2e3a9f46e0ab25e4dee"; # no tags + hash = "sha256-e9/KxPN/w0mrFYgesRGqaiDQ6gor7BpX/5/B0NPtXLY="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ hypothesis @@ -32,7 +32,7 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.mit; description = ''EZ Yang "golden" tests (testing against a reference implementation)''; - homepage = "https://github.com/ezyang/expecttest"; + homepage = "https://github.com/pytorch/expecttest"; platforms = lib.platforms.unix; }; } From e1b20bea893044ea22241024e0662bd75e0540a4 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Mon, 16 Sep 2024 12:56:39 +0200 Subject: [PATCH 034/132] libcdio-paranoia: 10.2+2.0.1 -> 10.2+2.0.2 --- .../libraries/libcdio-paranoia/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index b6fd599e0dfd..5f01756ecac0 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkg-config, - libiconv, IOKit, DiskArbitration}: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libcdio, + pkg-config, + libiconv, + IOKit, + DiskArbitration, +}: stdenv.mkDerivation rec { pname = "libcdio-paranoia"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "rocky"; repo = "libcdio-paranoia"; rev = "release-10.2+${version}"; - hash = "sha256-kNGhhslp5noAVeho0kBVfyvb4kQpDY56nyL3a4aFgjE="; + hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcdio ] ++ - lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = + [ libcdio ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + IOKit + DiskArbitration + ]; propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; - configureFlags = lib.optionals stdenv.isDarwin [ - "--disable-ld-version-script" - ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-ld-version-script" ]; meta = with lib; { description = "CD paranoia on top of libcdio"; From f6982dc31ca295fd659d2cfa6e987ffa694476a4 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 16 Sep 2024 20:51:20 +0800 Subject: [PATCH 035/132] metacubexd: 1.147.0 -> 1.149.0 Diff: https://github.com/MetaCubeX/metacubexd/compare/v1.147.0...v1.149.0 --- pkgs/by-name/me/metacubexd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index ed0bdb5b0f59..a8ddd60cc662 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.147.0"; + version = "1.149.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lj+w+u8xrjYYcINgFMVg8AoLonqRoHNRCyXdeDcXWDg="; + hash = "sha256-WpF8A7TUPVk/e/ezPlypnAldqklMfUS6RfuLvVNEWOY="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-kb+CtX4Jn3UIwXdRcyyrWnUhGaldrJQUl+F7RSWzmoI="; + hash = "sha256-WsaHl8dD5Fi7WEoLhYCkxVfMB/VJ8cllGY6EveqQYgY="; }; buildPhase = '' From e60dfa04148a5d5a5fcc93c3ec573d019546522e Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 16 Sep 2024 21:20:29 +0800 Subject: [PATCH 036/132] rsshub: 0-unstable-2024-07-08 -> 0-unstable-2024-09-16 --- pkgs/by-name/rs/rsshub/package.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 72aa065f2533..469d3531e522 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -4,34 +4,29 @@ makeBinaryWrapper, nodejs, pnpm, + replaceVars, stdenv, - substitute, }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2024-07-08"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "6a29ca395191e745f991b9a0643a2fa9a66c8730"; - hash = "sha256-K7qNPF1vdqhNEjWcysnj20Qaltu3rnhi1bVnIEOTiuk="; + rev = "6de50fb35dbdb93be43f315a8c2651e90c5195a9"; + hash = "sha256-fxkK1prrKfAmB5yqiOKdLPeJp/hO07KJNHLnYSQGPNE="; }; patches = [ - (substitute { - src = ./0001-fix-git-hash.patch; - substitutions = [ - "--subst-var-by" - "GIT_HASH" - finalAttrs.src.rev - ]; + (replaceVars ./0001-fix-git-hash.patch { + "GIT_HASH" = finalAttrs.src.rev; }) ]; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-1Djef4QRLiEKr6ERtL0/IQSYp9dMq3cOCHPW4QnfaZU="; + hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU="; }; nativeBuildInputs = [ From d447b5366ebdcc48c206e031befdd13c50f1a0ca Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 16 Sep 2024 23:20:43 +0200 Subject: [PATCH 037/132] smartmontools: build with systemdLibs on linux --- pkgs/tools/system/smartmontools/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 55ec05d2a9a7..7394fb7e59e7 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -6,6 +6,7 @@ , gnused , hostname , mailutils +, systemdLibs , IOKit , ApplicationServices }: @@ -45,7 +46,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; + buildInputs = lib.optionals stdenv.isLinux [ systemdLibs ] + ++ lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; enableParallelBuilding = true; meta = with lib; { From 4423e934513ebc0d04ff622e0ae80dbcb9cc7a14 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 16 Sep 2024 23:21:24 +0200 Subject: [PATCH 038/132] nixos/smartd: set `Type = notify` on systemd service --- nixos/modules/services/monitoring/smartd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 6fd3b5707ab6..65b6259c12bd 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -269,7 +269,10 @@ in systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + serviceConfig = { + Type = "notify"; + ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; + }; }; services.systembus-notify.enable = mkDefault ns.enable; From 94bc565cec30baee580bcab32e2a7bc6fc11efa6 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 16 Sep 2024 23:28:29 +0200 Subject: [PATCH 039/132] smartmontools: run nixfmt --- pkgs/tools/system/smartmontools/default.nix | 39 +++++++++++++-------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 7394fb7e59e7..50765fa2e170 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, enableMail ? false -, gnused -, hostname -, mailutils -, systemdLibs -, IOKit -, ApplicationServices +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + enableMail ? false, + gnused, + hostname, + mailutils, + systemdLibs, + IOKit, + ApplicationServices, }: let @@ -19,7 +20,13 @@ let sha256 = "sha256-0dtLev4JjeHsS259+qOgg19rz4yjkeX4D3ooUgS4RTI="; name = "smartmontools-drivedb.h"; }; - scriptPath = lib.makeBinPath ([ gnused hostname ] ++ lib.optionals enableMail [ mailutils ]); + scriptPath = lib.makeBinPath ( + [ + gnused + hostname + ] + ++ lib.optionals enableMail [ mailutils ] + ); in stdenv.mkDerivation rec { @@ -46,8 +53,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ systemdLibs ] - ++ lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; + buildInputs = + lib.optionals stdenv.isLinux [ systemdLibs ] + ++ lib.optionals stdenv.isDarwin [ + IOKit + ApplicationServices + ]; enableParallelBuilding = true; meta = with lib; { From cf76a0d0c4c1d591c2b28f51862ebabd0e2e0f1a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 17 Sep 2024 06:39:16 +0100 Subject: [PATCH 040/132] fheroes2: 1.1.1 -> 1.1.2 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.1.2 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 0d6ba0b24eb8..bc87f453d32b 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-RzMSHcyDsdZYTJYU53DjoCrCpy5gjgrtZb8NuP5trPk="; + hash = "sha256-FSfA2gjJZWAbl2nTJwkAhWcJghbw5ulftU+6QBqljxY="; }; nativeBuildInputs = [ imagemagick ]; From b2cb588ac48c185a32c1e39e08748de1829e3010 Mon Sep 17 00:00:00 2001 From: Benjamin Bugl Date: Mon, 16 Sep 2024 15:14:59 +0200 Subject: [PATCH 041/132] devcontainer: 0.65.0 -> 0.71.0 --- pkgs/by-name/de/devcontainer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 58dff97c8bee..c21b758b9af9 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -14,18 +14,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.65.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Q1qQjIRyOeFr8qrZJZ1IkO12RM2hp4IxI1NI7WqpmZA="; + hash = "sha256-plIDK5nOvLKFlRVlPHgpjHPhIh0NAWHmbaKsnYCU/7k="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ="; + hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; }; nativeBuildInputs = [ From a05066bf219f09d7c22f1f974426044e7fa98011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 12:23:50 +0000 Subject: [PATCH 042/132] apktool: 2.9.3 -> 2.10.0 --- pkgs/development/tools/apktool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 460d0686ff60..5b2585f6bce7 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.9.3"; + version = "2.10.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - hash = "sha256-eVbrBBlDAM4NCoStGHce68lLifuNHdzOjqTAVoGGRvQ="; + hash = "sha256-wDUKu6tTFCSN/i7gyQfe9O3RT2+u8fXTctPUq9KPBDE="; }; dontUnpack = true; From 5eacb43e8f0e17b474c947d89f59eeb772310f8f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 12 Sep 2024 11:37:55 +0200 Subject: [PATCH 043/132] jrl-cmakemodules: update to 0-unstable-2024-09-17 --- pkgs/by-name/jr/jrl-cmakemodules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 8dc01688de66..8ad3f29eac2e 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "jrl-cmakemodules"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-09-17"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; - rev = "88d3cb561d1f9faa3c6281da7b2b8d6aa76b04d5"; - hash = "sha256-3Su/tGtV39/tto1Hs5sgGgjpFWkBCvI2SZKqBIIDAjA="; + rev = "31e46019beda968ba9e516ad645a951c64256eed"; + hash = "sha256-pe21tE0ngUYGhEuGSI71TMdwyqTmZhc53hPKHngkTGQ="; }; nativeBuildInputs = [ cmake ]; From 720ee922ce08d2eb84fa3f24b9db3092f4e28aea Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:41:55 +0200 Subject: [PATCH 044/132] jrl-cmakemodules: set platforms --- pkgs/by-name/jr/jrl-cmakemodules/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 8ad3f29eac2e..22c9bafe6425 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jrl-umi3218/jrl-cmakemodules"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.all; }; } From 3cb8663422a3517782c0b2d574e778ae5177dd24 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 27 Aug 2024 11:32:56 +0200 Subject: [PATCH 045/132] proxsuite: 0.6.6 -> 0.6.7 Diff: https://github.com/simple-robotics/proxsuite/compare/v0.6.6...v0.6.7 --- pkgs/by-name/pr/proxsuite/package.nix | 39 ++++++--------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index dcaf8bc6f7f2..eb3b28d5520c 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - cereal, + cereal_1_3_2, cmake, doxygen, eigen, @@ -15,47 +15,24 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "proxsuite"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "simple-robotics"; repo = "proxsuite"; rev = "v${finalAttrs.version}"; - hash = "sha256-3kzFYADk3sCMU827KowilPlmOqgv69DJ3mOb7623Qdg="; + hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME="; }; patches = [ - # Allow use of system jrl-cmakemodules - # This was merged upstream, and can be removed on next release + # Fix use of system cereal + # This was merged upstream and can be removed on next release (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/2bcadd4993a9940c545136faa71bf1e97a972735.patch"; - hash = "sha256-BPtwogSwSXcEd5FM4eTTCq6LpGWvQ1SOCFmv/GVhl18="; - }) - # Allow use of system cereal - # This was merged upstream, and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/334/commits/878337c6284c9fd73b19f1f80d5fa802def8cdc6.patch"; - hash = "sha256-+HWYHLGtygjlvjM+FSD9WFDIwO+qPLlzci+7q42bo0I="; - }) - # Allow use of system pybind11 - # upstream will move to nanobind for next release, so this can be dismissed - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/337/commits/bbed9bdfb214da7c6c6909582971bd8b877f87c2.patch"; - hash = "sha256-pYikPZinjmk7gsagiaIcQspmGFYwlhdiKdZPnqo7pcQ="; + url = "https://github.com/Simple-Robotics/proxsuite/pull/352/commits/8305864f13ca7dff7210f89004a56652b71f8891.patch"; + hash = "sha256-XMS/zHFVrEp1P6aDlGrLbrcmuKq42+GdZRH9ObewNCY="; }) ]; - postPatch = '' - # discard failing tests for now - substituteInPlace test/CMakeLists.txt \ - --replace-fail "proxsuite_test(dense_maros_meszaros src/dense_maros_meszaros.cpp)" "" \ - --replace-fail "proxsuite_test(sparse_maros_meszaros src/sparse_maros_meszaros.cpp)" "" - - # fix CMake syntax - substituteInPlace bindings/python/CMakeLists.txt \ - --replace-fail "SYSTEM PRIVATE" "PRIVATE" - ''; - outputs = [ "doc" "out" @@ -78,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { doxygen ]; propagatedBuildInputs = [ - cereal + cereal_1_3_2 eigen jrl-cmakemodules simde From d33c80812d8aacfa4c68c0e2e7648ba5bd78305b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:44:33 +0200 Subject: [PATCH 046/132] proxsuite: fix doc --- pkgs/by-name/pr/proxsuite/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index eb3b28d5520c..248be6e3e1fa 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -7,6 +7,8 @@ cmake, doxygen, eigen, + fontconfig, + graphviz, jrl-cmakemodules, simde, matio, @@ -53,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen + graphviz ]; propagatedBuildInputs = [ cereal_1_3_2 @@ -67,6 +70,12 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.scipy ]; + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + doCheck = true; meta = { From f49ed4e558818197ab3576ed91d24d28d053e311 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:44:43 +0200 Subject: [PATCH 047/132] proxsuite: python import check --- pkgs/by-name/pr/proxsuite/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 248be6e3e1fa..2727d13022f5 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { cmake doxygen graphviz - ]; + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; propagatedBuildInputs = [ cereal_1_3_2 eigen @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; doCheck = true; + pythonImportsCheck = [ "proxsuite" ]; meta = { description = "The Advanced Proximal Optimization Toolbox"; From f56b1eff0a48175c0d374ee64fd16f710abfa383 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:44:53 +0200 Subject: [PATCH 048/132] proxsuite: set platforms --- pkgs/by-name/pr/proxsuite/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 2727d13022f5..6aba0e20c76e 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -84,5 +84,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Simple-Robotics/proxsuite"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) From 547fc589b92be01ac001fcff5587dc1cec6f66f8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:49:24 +0200 Subject: [PATCH 049/132] hpp-fcl: use pythonImportsCheckHook --- pkgs/by-name/hp/hpp-fcl/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hp/hpp-fcl/package.nix b/pkgs/by-name/hp/hpp-fcl/package.nix index 78ce6456c301..17812ffbea8d 100644 --- a/pkgs/by-name/hp/hpp-fcl/package.nix +++ b/pkgs/by-name/hp/hpp-fcl/package.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen - ] ++ lib.optionals pythonSupport [ python3Packages.numpy ]; + ] ++ lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ @@ -56,11 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import hppfcl" - ''; + pythonImportsCheck = [ "hppfcl" ]; outputs = [ "dev" From 5edda6c9d0e137b725ede3f241c24dd2f2c83c24 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:49:36 +0200 Subject: [PATCH 050/132] hpp-fcl: set platforms --- pkgs/by-name/hp/hpp-fcl/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hp/hpp-fcl/package.nix b/pkgs/by-name/hp/hpp-fcl/package.nix index 17812ffbea8d..1c20411b1184 100644 --- a/pkgs/by-name/hp/hpp-fcl/package.nix +++ b/pkgs/by-name/hp/hpp-fcl/package.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) From 8c8c27bb19bf718ee1f2ac8ecdd45db710739070 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 18 Sep 2024 01:00:07 +0200 Subject: [PATCH 051/132] treewide: remove unused inputs --- pkgs/applications/audio/mbrola/voices.nix | 1 - pkgs/applications/blockchains/monero-cli/default.nix | 1 - pkgs/applications/editors/emacs/make-emacs.nix | 1 - .../editors/jupyter-kernels/xeus-cling/default.nix | 5 ----- pkgs/applications/editors/neovim/wrapper.nix | 2 -- pkgs/applications/misc/sweethome3d/default.nix | 1 - pkgs/applications/networking/browsers/floorp/default.nix | 2 -- .../applications/networking/browsers/ladybird/default.nix | 1 - pkgs/applications/networking/cluster/hadoop/default.nix | 1 - pkgs/applications/networking/cluster/spark/default.nix | 2 -- pkgs/applications/science/electronics/kicad/libraries.nix | 1 - pkgs/applications/science/misc/snakemake/default.nix | 2 -- .../system/coolercontrol/coolercontrol-gui.nix | 1 - pkgs/applications/system/coolercontrol/coolercontrold.nix | 1 - pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 1 - pkgs/by-name/an/antares/package.nix | 1 - pkgs/by-name/ar/art/package.nix | 1 - pkgs/by-name/br/brainflow/package.nix | 1 - pkgs/by-name/ci/cinnamon-common/package.nix | 1 - pkgs/by-name/ci/cinnamon-control-center/package.nix | 1 - pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix | 1 - pkgs/by-name/ci/cinnamon-session/package.nix | 1 - pkgs/by-name/co/composefs/package.nix | 2 -- pkgs/by-name/de/densify/package.nix | 1 - pkgs/by-name/gn/gnome-panel/wrapper.nix | 1 - pkgs/by-name/gn/gnome-settings-daemon/43/default.nix | 1 - pkgs/by-name/ha/handbrake/package.nix | 1 - pkgs/by-name/kr/krun/package.nix | 1 - pkgs/by-name/le/ledger-autosync/package.nix | 1 - pkgs/by-name/li/libresample/package.nix | 1 - pkgs/by-name/li/lime3ds/package.nix | 1 - pkgs/by-name/mu/mutter/43/default.nix | 1 - pkgs/by-name/ne/nexusmods-app/package.nix | 1 - pkgs/by-name/pe/peertube-viewer/package.nix | 1 - pkgs/by-name/sb/sby/package.nix | 1 - pkgs/by-name/sy/syndicate_utils/package.nix | 1 - pkgs/by-name/te/termpaint/package.nix | 1 - pkgs/by-name/un/unhide-gui/package.nix | 1 - pkgs/by-name/xr/xreader/package.nix | 1 - pkgs/by-name/xw/xwiimote/package.nix | 1 - pkgs/by-name/yt/yt-dlg/package.nix | 1 - pkgs/by-name/zi/zitadel/console.nix | 2 -- pkgs/data/misc/shared-mime-info/default.nix | 1 - pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix | 5 ----- pkgs/desktops/deepin/apps/deepin-music/default.nix | 1 - pkgs/desktops/deepin/apps/deepin-reader/default.nix | 1 - pkgs/desktops/deepin/core/dde-appearance/default.nix | 1 - pkgs/desktops/deepin/core/dde-grand-search/default.nix | 1 - .../deepin/core/dde-gsettings-schemas/default.nix | 1 - pkgs/desktops/deepin/default.nix | 1 - pkgs/desktops/deepin/go-package/dde-daemon/default.nix | 3 --- .../deepin/library/deepin-ocr-plugin-manager/default.nix | 1 - .../deepin/library/qt6platform-plugins/default.nix | 1 - pkgs/desktops/enlightenment/efl/default.nix | 1 - pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix | 1 - .../lomiri/applications/lomiri-docviewer-app/default.nix | 1 - pkgs/desktops/lomiri/data/lomiri-session/default.nix | 1 - .../wingpanel-indicators/applications-menu/default.nix | 1 - .../desktop/wingpanel-indicators/datetime/default.nix | 1 - .../desktop/wingpanel-indicators/network/default.nix | 1 - pkgs/development/interpreters/lua-5/hooks/default.nix | 1 - pkgs/development/libraries/physics/cernlib/default.nix | 1 - .../development/python-modules/ahocorasick-rs/default.nix | 1 - pkgs/development/python-modules/cffi/default.nix | 2 -- pkgs/development/python-modules/ctypesgen/default.nix | 1 - .../python-modules/django-payments/default.nix | 1 - pkgs/development/python-modules/fenics/default.nix | 1 - pkgs/development/python-modules/fickling/default.nix | 2 -- .../python-modules/langchain-mongodb/default.nix | 6 ------ .../python-modules/opentelemetry-api/default.nix | 1 - .../python-modules/opentelemetry-sdk/default.nix | 1 - pkgs/development/python-modules/py-libzfs/default.nix | 1 - pkgs/development/python-modules/pygmars/default.nix | 1 - pkgs/development/python-modules/pylama/default.nix | 1 - .../python-modules/python-datemath/default.nix | 1 - pkgs/development/python-modules/pyzx/default.nix | 1 - pkgs/development/python-modules/saneyaml/default.nix | 1 - pkgs/development/python-modules/scikit-image/default.nix | 1 - .../snakemake-storage-plugin-fs/default.nix | 1 - pkgs/development/python-modules/spacy/default.nix | 1 - pkgs/development/python-modules/textx/default.nix | 8 -------- pkgs/development/python-modules/thinc/default.nix | 1 - pkgs/development/python-modules/xnd/default.nix | 1 - pkgs/games/7kaa/default.nix | 1 - pkgs/games/cgoban/default.nix | 1 - pkgs/games/crossfire/crossfire-server.nix | 1 - pkgs/games/runescape-launcher/default.nix | 1 - pkgs/kde/third-party/applet-window-buttons6/default.nix | 1 - pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix | 1 - pkgs/misc/ite-backlight/default.nix | 1 - pkgs/servers/akkoma/default.nix | 1 - pkgs/servers/hbase/default.nix | 1 - pkgs/servers/http/angie/console-light.nix | 1 - pkgs/servers/http/trafficserver/default.nix | 2 -- pkgs/servers/mail/opensmtpd/default.nix | 1 - pkgs/servers/matrix-hebbot/default.nix | 1 - pkgs/servers/sql/postgresql/ext/pg_repack.nix | 2 -- pkgs/servers/sql/postgresql/ext/repmgr.nix | 3 --- pkgs/servers/web-apps/hedgedoc/default.nix | 1 - pkgs/tools/audio/beets/default.nix | 2 -- pkgs/tools/backup/borgmatic/default.nix | 1 - pkgs/tools/compression/gzip/default.nix | 1 - pkgs/tools/filesystems/dwarfs/default.nix | 1 - pkgs/tools/misc/gummy/default.nix | 1 - pkgs/tools/misc/lorri/runtime.nix | 1 - pkgs/tools/misc/ostree/default.nix | 2 -- pkgs/tools/networking/mozillavpn/default.nix | 1 - pkgs/tools/networking/narrowlink/default.nix | 2 -- pkgs/tools/networking/ntopng/default.nix | 1 - pkgs/tools/networking/xrootd/fetchxrd.nix | 1 - pkgs/tools/nix/nixci/default.nix | 1 - pkgs/tools/package-management/ciel/default.nix | 1 - 112 files changed, 149 deletions(-) diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/applications/audio/mbrola/voices.nix index 4244a9b62ae9..df4521acd609 100644 --- a/pkgs/applications/audio/mbrola/voices.nix +++ b/pkgs/applications/audio/mbrola/voices.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - unstableGitUpdater, mbrola, languages ? [ ], }: diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 7a1069357278..7cb476ce4edf 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - ninja, pkg-config, boost, libsodium, diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index f995b073d377..dbfcebe01c59 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -31,7 +31,6 @@ , jansson , libXaw , libXcursor -, libXft , libXi , libXpm , libgccjit diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index 943a7e49e9cd..4158fc3dff0a 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -1,11 +1,6 @@ { callPackage -, clangStdenv , cling , fetchurl -, lib -, llvmPackages_13 -, makeWrapper -, runCommand , stdenv }: diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 02d6ad85b367..8b31ed0a2a38 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -2,10 +2,8 @@ , writeText , nodePackages , python3 -, python3Packages , callPackage , neovimUtils -, vimUtils , perl , lndir }: diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4745a942304a..c441ca300858 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -12,7 +12,6 @@ , p7zip , autoPatchelfHook , libXxf86vm -, unzip , libGL }: diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 2cbd81d7ab57..c0fb48dc83ca 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -2,10 +2,8 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, buildMozillaMach, nixosTests, - python311, }: ( diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 15ed027ded35..be22339417bd 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -12,7 +12,6 @@ , pkg-config , libavif , libjxl -, libtiff , libwebp , libxcrypt , python3 diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index d9f20411a5a0..91727d4f5801 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,6 @@ , zlib , zstd , openssl -, glibc , nixosTests , sparkSupport ? true , spark diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index f717ec92267f..86e98c3a419d 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -2,9 +2,7 @@ , stdenv , fetchzip , makeWrapper -, jdk8 , python3 -, coreutils , hadoop , RSupport ? true , R diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 327f77d1c42f..4a3e40a3166d 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, gettext , libSrc , stepreduce , parallel diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 68204d0fa41d..07cc2ceaedcc 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,8 +1,6 @@ { lib , fetchPypi -, fetchpatch , python3 -, runtimeShell , stress }: diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 25f62fad9bbf..cb3e0c22835e 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,5 +1,4 @@ { lib -, buildNpmPackage , rustPlatform , dbus , freetype diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 40db1cebacec..16e55a8c21f2 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,5 +1,4 @@ { rustPlatform -, buildNpmPackage , testers , libdrm , coolercontrol diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 0a00b04c7192..fa148c3cde2a 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -2,7 +2,6 @@ lib, buildLua, fetchFromGitHub, - fetchpatch, unstableGitUpdater, libnotify, }: diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index fae2010e20a6..c433cab7ebcc 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -4,7 +4,6 @@ buildNpmPackage, electron, nodejs, - fetchpatch, }: buildNpmPackage rec { diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 67f9032faebb..1693b2eab304 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -4,7 +4,6 @@ , cmake , pkg-config , wrapGAppsHook3 -, makeWrapper , pixman , libpthreadstubs , gtkmm3 diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index a347712c057b..e2c6726696f1 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bluez, cmake, dbus, diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index ae9f77416a1d..cb37c0a8dc36 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -18,7 +18,6 @@ , gtk3 , intltool , json-glib -, callPackage , libstartup_notification , libXtst , libXdamage diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index b5a98a9090b9..2c9308f15a92 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -18,7 +18,6 @@ , networkmanager , libgudev , libwacom -, gnome , wrapGAppsHook3 , tzdata , glibc diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix index 7234d00d9c06..0969fb112339 100644 --- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix +++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix @@ -1,6 +1,5 @@ { lib , runCommand -, nixos-artwork , glib , gnome-terminal , gtk3 diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 79dd3e555d83..790e0cfe6efc 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -8,7 +8,6 @@ , gtk3 , libcanberra , libxslt -, makeWrapper , meson , ninja , pkg-config diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 80b832a56174..35d114e8954a 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch - , meson , ninja , go-md2man diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix index 0b2e1c314371..b4f2797ba94b 100644 --- a/pkgs/by-name/de/densify/package.nix +++ b/pkgs/by-name/de/densify/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, gtk3, gobject-introspection, wrapGAppsHook3, diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix index b52bab969403..9fb6d3c2d1dd 100644 --- a/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -2,7 +2,6 @@ stdenv, lib, buildEnv, - gnome, gnome-panel, gnome-flashback, xorg, diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix index 2643d0f9a904..23d0a8eaa720 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix @@ -7,7 +7,6 @@ meson, ninja, pkg-config, - gnome, perl, gettext, gtk3, diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index 50c487a46683..c24cee4960f9 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -11,7 +11,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, # For tests testers, runCommand, diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix index d851203a30fd..430916abaa5a 100644 --- a/pkgs/by-name/kr/krun/package.nix +++ b/pkgs/by-name/kr/krun/package.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, libiconv , libkrun , makeWrapper , passt diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix index 1f4e6a3413f0..16c273f75a78 100644 --- a/pkgs/by-name/le/ledger-autosync/package.nix +++ b/pkgs/by-name/le/ledger-autosync/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch2, ledger, hledger, }: diff --git a/pkgs/by-name/li/libresample/package.nix b/pkgs/by-name/li/libresample/package.nix index 66fd57edbe66..2b8f3b2cd5a3 100644 --- a/pkgs/by-name/li/libresample/package.nix +++ b/pkgs/by-name/li/libresample/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - cmake, meson, ninja, pkg-config, diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 62c70f5b69f6..a68d69553b54 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -7,7 +7,6 @@ , doxygen , enet , fetchzip -, fetchurl , fmt , ffmpeg-headless , gamemode diff --git a/pkgs/by-name/mu/mutter/43/default.nix b/pkgs/by-name/mu/mutter/43/default.nix index b79c839ec3eb..bea00d83f794 100644 --- a/pkgs/by-name/mu/mutter/43/default.nix +++ b/pkgs/by-name/mu/mutter/43/default.nix @@ -5,7 +5,6 @@ fetchpatch, stdenv, pkg-config, - gnome, gettext, gobject-introspection, cairo, diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 6d07a5b93f9e..333a99b200d4 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -5,7 +5,6 @@ desktop-file-utils, dotnetCorePackages, fetchFromGitHub, - fontconfig, lib, runCommand, pname ? "nexusmods-app", diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 5d3583c2f73c..3981fb69f311 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitLab, rustPlatform, - youtube-dl, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index d623f732d2d6..0390df3e0519 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -10,7 +10,6 @@ z3, aiger, btor2tools, - python3Packages, nix-update-script, }: diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index 943b5ab4e827..ee425f44d5d7 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -5,7 +5,6 @@ libxml2, libxslt, openssl, - pkg-config, postgresql, sqlite, }: diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix index acd730dcf5bc..217d27955192 100644 --- a/pkgs/by-name/te/termpaint/package.nix +++ b/pkgs/by-name/te/termpaint/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, meson, ninja, - cmake, pkg-config, python3, }: diff --git a/pkgs/by-name/un/unhide-gui/package.nix b/pkgs/by-name/un/unhide-gui/package.nix index 5fd01f39b503..a8c988ee6d2d 100644 --- a/pkgs/by-name/un/unhide-gui/package.nix +++ b/pkgs/by-name/un/unhide-gui/package.nix @@ -2,7 +2,6 @@ fetchFromGitHub, lib, python3Packages, - python3, unhide, }: diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index c8bfafdb684d..bf1ad8410bd0 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -20,7 +20,6 @@ , webkitgtk_4_1 , nodePackages , ninja -, gsettings-desktop-schemas , djvulibre , backends ? [ "pdf" "ps" /* "dvi" "t1lib" */ "djvu" "tiff" "pixbuf" "comics" "xps" "epub" ] }: diff --git a/pkgs/by-name/xw/xwiimote/package.nix b/pkgs/by-name/xw/xwiimote/package.nix index a17299197d27..0114dba71400 100644 --- a/pkgs/by-name/xw/xwiimote/package.nix +++ b/pkgs/by-name/xw/xwiimote/package.nix @@ -5,7 +5,6 @@ ncurses, pkg-config, fetchFromGitHub, - bluez, autoreconfHook, }: diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix index c40befc28d8e..a5ba63307be0 100644 --- a/pkgs/by-name/yt/yt-dlg/package.nix +++ b/pkgs/by-name/yt/yt-dlg/package.nix @@ -2,7 +2,6 @@ lib, python3Packages, fetchFromGitHub, - fetchPypi, }: python3Packages.buildPythonApplication rec { pname = "yt-dlg"; diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix index 5ffd0a2223ec..d73d34b8d717 100644 --- a/pkgs/by-name/zi/zitadel/console.nix +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -5,8 +5,6 @@ { mkYarnPackage , fetchYarnDeps -, lib - , grpc-gateway , protoc-gen-grpc-web , protoc-gen-js diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 9e034d68241d..e5507075bcae 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -5,7 +5,6 @@ , ninja , pkg-config , gettext -, itstool , libxml2 , glib , shared-mime-info diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 31ce23124cd2..fa5c20c8f545 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -8,15 +8,10 @@ qttools, wrapQtAppsHook, qt5platform-plugins, - qtbase, dtkwidget, dtkdeclarative, deepin-ocr-plugin-manager, - gio-qt, - udisks2-qt5, - image-editor, libraw, - libexif, freeimage, }: diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 41555483ccd0..16dc19831085 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -18,7 +18,6 @@ libvlc, taglib, SDL2, - qtbase, gst_all_1, }: diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 2bae6bf3e778..f2ad2569b248 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -17,7 +17,6 @@ libspectre, openjpeg, djvulibre, - qtbase, gtest, }: diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index 89315e2bd8a3..5a2648d690e8 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -5,7 +5,6 @@ cmake, pkg-config, wrapQtAppsHook, - qtbase, dtkgui, gsettings-qt, gtk3, diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 11f2d4d403f4..92109c2d9772 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -18,7 +18,6 @@ pcre, lucenepp, boost, - dbus, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 0581339c254f..cb6b0acded83 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -2,7 +2,6 @@ lib, runCommand, glib, - gtk3, dde-grand-search, startdde, dde-session-shell, diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index d65299696e04..fc8137cac857 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, config, libsForQt5, }: diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 563057ddebf0..bbc43448b044 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -24,9 +24,6 @@ tzdata, xkeyboard_config, runtimeShell, - xorg, - xdotool, - getconf, dbus, util-linux, dde-session-ui, diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix index 34c7b83f818f..f5da5c8fee71 100644 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix @@ -6,7 +6,6 @@ cmake, qttools, wrapQtAppsHook, - libisoburn, ncnn, opencv, vulkan-headers, diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 09bd21a24835..84eff44d2330 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, mtdev, diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 009150c8a38f..ce6f77537863 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -44,7 +44,6 @@ , openjpeg , openssl , poppler -, python3Packages , systemd , udev , util-linux diff --git a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix index 22359e9a5827..398e9144e244 100644 --- a/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix +++ b/pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix @@ -1,6 +1,5 @@ { runCommand, - pkg-config, gdk-pixbuf, lib, stdenv, diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 2618553236f2..165987ef18c9 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -9,7 +9,6 @@ cmake, content-hub, gettext, - libreoffice, libreoffice-unwrapped, lomiri-ui-toolkit, pkg-config, diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 21da8a635dcd..960fb2794c84 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -12,7 +12,6 @@ lomiri, makeWrapper, pkg-config, - runtimeShell, systemd, }: diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 9da4e8c2927a..12746579c499 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -13,7 +13,6 @@ , libgee , gettext , gtk3 -, gnome-menus , json-glib , elementary-dock , bamf diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c9e8de572ed4..a413498447ba 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -16,7 +16,6 @@ , libhandy , libxml2 , libsoup -, libgdata , elementary-calendar }: diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index dcb30a6a2d5b..5b66bc1de6f3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , pkg-config , meson , ninja diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index 02716568acfd..5f935626fec4 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -2,7 +2,6 @@ { lua , lib , makeSetupHook -, findutils , runCommand }: diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index e4a2f2435b97..13d1cb081249 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -6,7 +6,6 @@ cmake, freetype, gfortran, - gnused, openssl, libnsl, motif, diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index aeb12385ac79..63c849e3537b 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, rustPlatform, - typing-extensions, pytestCheckHook, pyahocorasick, hypothesis, diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 199324d0e420..9fbbdd371f9b 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -4,13 +4,11 @@ buildPythonPackage, isPyPy, fetchPypi, - fetchpatch2, setuptools, pytestCheckHook, libffi, pkg-config, pycparser, - pythonAtLeast, }: let diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix index 7eea6b726717..ff7a8f7b3253 100644 --- a/pkgs/development/python-modules/ctypesgen/default.nix +++ b/pkgs/development/python-modules/ctypesgen/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - unittestCheckHook, pythonOlder, setuptools-scm, setuptools, diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 62e4484e4553..33824cb5b255 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -11,7 +11,6 @@ requests, setuptools, setuptools-scm, - sphinx-rtd-theme, stripe, suds-community, xmltodict, diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index a5b9902fecf8..b2750f7a7054 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -8,7 +8,6 @@ cmake, doxygen, eigen, - gtest, hdf5, lapack, mpi, diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index a5de0d913a2c..44bb00c6bec6 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -4,9 +4,7 @@ buildPythonPackage, distutils, fetchFromGitHub, - fickling, flit-core, - numpy, pytestCheckHook, pythonOlder, torch, diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 9d8f59e3c771..cf99e1fdf16d 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -14,16 +14,10 @@ freezegun, httpx, langchain, - lark, - pandas, pytest-asyncio, pytestCheckHook, pytest-mock, - pytest-socket, - requests-mock, - responses, syrupy, - toml, nix-update-script, }: diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 6fc86512d485..fdaa41d289ef 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -7,7 +7,6 @@ hatchling, importlib-metadata, opentelemetry-test-utils, - setuptools, pytestCheckHook, writeScript, }: diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index cfa6e6249512..9e4b577a606e 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -6,7 +6,6 @@ opentelemetry-api, opentelemetry-semantic-conventions, opentelemetry-test-utils, - setuptools, typing-extensions, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index b66839c0722f..1400a066c522 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - setuptools, cython_0, zfs, }: diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 5536490860d1..11bd26ee9531 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -5,7 +5,6 @@ pytestCheckHook, setuptools-scm, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 221c1e936f03..112d9392d80d 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -12,7 +12,6 @@ pyflakes, vulture, setuptools, - isort, pylint, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix index f5c1306f6631..efa1e5aed576 100644 --- a/pkgs/development/python-modules/python-datemath/default.nix +++ b/pkgs/development/python-modules/python-datemath/default.nix @@ -3,7 +3,6 @@ arrow, buildPythonPackage, fetchFromGitHub, - fetchpatch, freezegun, pytestCheckHook, pythonOlder, diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index a391f26a3139..d39d2b48ef24 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - pythonRelaxDepsHook, pytestCheckHook, setuptools, ipywidgets, diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 1f27c46dd641..0e47b565bba7 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -6,7 +6,6 @@ pyyaml, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index c6ea5ba79645..369f1bf78e5c 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -27,7 +27,6 @@ scipy, setuptools, simpleitk, - six, tifffile, wheel, }: diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix index 64c6d4b421d2..18925b034c05 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - snakemake, snakemake-interface-storage-plugins, snakemake-interface-common, sysrsync, diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 51d20b3f2498..03fffb27b8a4 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - blis, buildPythonPackage, callPackage, catalogue, diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index ea0f56717d52..924464439578 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -3,17 +3,9 @@ buildPythonPackage, python, fetchFromGitHub, - mkdocs, - twine, arpeggio, click, - future, - setuptools, callPackage, - gprof2dot, - html5lib, - jinja2, - psutil, flit-core, }: diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b0754a32de76..d4c35796a270 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -19,7 +19,6 @@ preshed, pydantic, pytestCheckHook, - python, pythonOlder, setuptools, srsly, diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 72ab840f1a6a..dcf396c079e5 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, buildPythonPackage, python, ndtypes, diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index 972e959c1ec3..e28eca772aa9 100644 --- a/pkgs/games/7kaa/default.nix +++ b/pkgs/games/7kaa/default.nix @@ -7,7 +7,6 @@ , fetchurl , fetchFromGitHub , openal -, libtool , enet , SDL2 , curl diff --git a/pkgs/games/cgoban/default.nix b/pkgs/games/cgoban/default.nix index 5b453b728d4c..73dd262173ee 100644 --- a/pkgs/games/cgoban/default.nix +++ b/pkgs/games/cgoban/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, writers , temurin-jre-bin-17 , fetchurl , makeWrapper diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index 214fdf65451b..aab4e2c2032b 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchsvn -, autoreconfHook , autoconf , automake , libtool diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 6bed4908f471..700003f640b0 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -8,7 +8,6 @@ , gcc-unwrapped , glib , glibc -, gnome2 , gtk2-x11 , libGL , libpulseaudio diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index 3f157eb2f5b0..be70f8398f41 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , kcoreaddons diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix index 8ebcccbaa281..2b265498ac6d 100644 --- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -1,5 +1,4 @@ { lib -, findutils , stdenv , fetchurl , dpkg diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/misc/ite-backlight/default.nix index 376c4c409ca0..9660ad613be1 100644 --- a/pkgs/misc/ite-backlight/default.nix +++ b/pkgs/misc/ite-backlight/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchpatch , ninja diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index ec69767338aa..8336cb4a9af4 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -5,7 +5,6 @@ , fetchFromGitLab , cmake , file -, writeText , nixosTests , ... }: diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 401ebef8bd2b..93afa6d5e19f 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , makeWrapper -, jdk8_headless , jdk11_headless , nixosTests }: diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix index 15d035d21d82..0966e9b94a21 100644 --- a/pkgs/servers/http/angie/console-light.nix +++ b/pkgs/servers/http/angie/console-light.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, gzip , brotli }: diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 927ee7246c31..59b199bd9a2a 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -10,8 +10,6 @@ , pcre , perlPackages , python3 -, xz -, zlib , catch2 # recommended dependencies , withHwloc ? true diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index c642c62be1ce..69244b86d62b 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -6,7 +6,6 @@ , pkgconf , libtool , bison -, libasr , libevent , zlib , libressl diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix index 24d1d89ecde5..ca90304ed32f 100644 --- a/pkgs/servers/matrix-hebbot/default.nix +++ b/pkgs/servers/matrix-hebbot/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, pkgs , stdenv , rustPlatform , pkg-config diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index c265ae39ca46..b2a608a2bc39 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,10 +1,8 @@ { lib , stdenv , fetchFromGitHub -, openssl , postgresql , postgresqlTestHook -, readline , testers , zlib }: diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index e4e8c5afdb24..dd55743a43cf 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -2,9 +2,6 @@ , stdenv , fetchFromGitHub , postgresql -, openssl -, zlib -, readline , flex , curl , json_c diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 8deafe9e531a..1db614f03acb 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -6,7 +6,6 @@ , yarn , makeBinaryWrapper , nodejs -, node-gyp , python3 , nixosTests }: diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index caa160cf1764..85244c0e0b89 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,8 +1,6 @@ { lib , callPackage , fetchFromGitHub -, fetchPypi -, fetchpatch , python3Packages }: /* diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 4fff9111bd1a..4aa4d649398c 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -4,7 +4,6 @@ coreutils, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, fetchPypi, - fetchpatch, installShellFiles, lib, python3Packages, diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 05539050861f..8b10fa1c98d4 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,7 +2,6 @@ , fetchurl , makeWrapper , updateAutotoolsGnuConfigScriptsHook -, xz , runtimeShellPackage }: diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 719ccd1e23d2..50c2121997da 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, stdenv, - substituteAll, bison, boost, cmake, diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix index 8e75d2ab1a6e..e2d600d8e2ee 100644 --- a/pkgs/tools/misc/gummy/default.nix +++ b/pkgs/tools/misc/gummy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitea -, substituteAll , testers , gummy , cmake diff --git a/pkgs/tools/misc/lorri/runtime.nix b/pkgs/tools/misc/lorri/runtime.nix index 96b14b26e82c..7e6883be0644 100644 --- a/pkgs/tools/misc/lorri/runtime.nix +++ b/pkgs/tools/misc/lorri/runtime.nix @@ -2,7 +2,6 @@ # Plumbing tools: closureInfo , runCommand -, writeText , buildEnv , # Actual dependencies to propagate: bash diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index cab9aba3d90c..7b9d9ac51e12 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , fetchpatch -, substituteAll , pkg-config , gtk-doc , gobject-introspection @@ -34,7 +33,6 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 -, openssl , python3 }: diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 0e3d43d191e6..aa8585349da2 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -11,7 +11,6 @@ libgpg-error, libsecret, pkg-config, - polkit, python3, qt5compat, qtbase, diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/tools/networking/narrowlink/default.nix index 142d6a680b70..62d9bd369ee7 100644 --- a/pkgs/tools/networking/narrowlink/default.nix +++ b/pkgs/tools/networking/narrowlink/default.nix @@ -1,8 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config -, openssl , stdenv , darwin }: diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 134c6f657547..04f5648dd317 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -5,7 +5,6 @@ curl, expat, fetchFromGitHub, - fetchpatch, git, json_c, libcap, diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index 21d7a2a0386d..6d1a0958d27c 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -1,6 +1,5 @@ { lib , runCommandLocal -, buildPlatform , xrootd }: diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index 304c5ff8ce6a..30e23c4f63ec 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , fetchFromGitHub -, libiconv , openssl , pkg-config , Security diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix index ed1103b869b9..cb1384869557 100644 --- a/pkgs/tools/package-management/ciel/default.nix +++ b/pkgs/tools/package-management/ciel/default.nix @@ -2,7 +2,6 @@ , bash , dbus , fetchFromGitHub -, fetchpatch , installShellFiles , libgit2 , libssh2 From 92f4e6f3c344e60c244f1dbe4c638c27c2519627 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 10:19:22 +0200 Subject: [PATCH 052/132] hpp-fcl: format --- pkgs/by-name/hp/hpp-fcl/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/hp/hpp-fcl/package.nix b/pkgs/by-name/hp/hpp-fcl/package.nix index 1c20411b1184..80e715425034 100644 --- a/pkgs/by-name/hp/hpp-fcl/package.nix +++ b/pkgs/by-name/hp/hpp-fcl/package.nix @@ -28,13 +28,15 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - ] ++ lib.optionals pythonSupport [ - python3Packages.numpy - python3Packages.pythonImportsCheckHook - ]; + nativeBuildInputs = + [ + cmake + doxygen + ] + ++ lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ From 4fcd1d39088163ad80e0682111949e22e9e17916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:30:14 +0200 Subject: [PATCH 053/132] fedifetcher: check if all requirements are there Until we have a proper wheel, we can check with that if all deps are there. https://github.com/nanos/FediFetcher/issues/177 --- pkgs/tools/misc/fedifetcher/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index a15b2c516edf..f141c713b165 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3, stdenv }: python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; @@ -26,6 +26,14 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + runHook preCheck + + $out/bin/fedifetcher --help>/dev/null + + runHook postCheck + ''; + meta = with lib; { description = "Tool for Mastodon that automatically fetches missing replies and posts from other fediverse instances"; longDescription = '' From 77f6d18c9edb6bbd545b1278dca032a28c464967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:30:39 +0200 Subject: [PATCH 054/132] fedifetcher: add meta.changelog --- pkgs/tools/misc/fedifetcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index f141c713b165..dbdf514dbb90 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { own Mastodon instance. ''; homepage = "https://blog.thms.uk/fedifetcher"; + changelog = "https://github.com/nanos/FediFetcher/releases/tag/v${version}"; license = licenses.mit; maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; From d6b24c590f2e6441af7c8aa95965c793575cd2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:32:18 +0200 Subject: [PATCH 055/132] fedifetcher: add missing dep from last update --- pkgs/tools/misc/fedifetcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index dbdf514dbb90..91d39d4d1f27 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -16,6 +16,7 @@ python3.pkgs.buildPythonApplication rec { defusedxml python-dateutil requests + xxhash ]; installPhase = '' From 4f2836b69b950cb4d6055f318289a5cb99f4f8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 18 Sep 2024 14:32:39 +0200 Subject: [PATCH 056/132] fedifetcher: 7.1.7 -> 7.1.12 Diff: https://github.com/nanos/FediFetcher/compare/refs/tags/v7.1.7...v7.1.12 Changelog: https://github.com/nanos/FediFetcher/releases/tag/v7.1.12 --- pkgs/tools/misc/fedifetcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 91d39d4d1f27..4eac63989761 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.7"; + version = "7.1.12"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-1QLVhqyH0wb8om2pFJfmgJcYp9DTuT5KZpLy5InlRr8="; + hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; }; propagatedBuildInputs = with python3.pkgs; [ From 9366f2b44a173b726534f9491862a8af11f71f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 18 Sep 2024 17:53:21 +0200 Subject: [PATCH 057/132] tor-browser: 13.5.3 -> 13.5.4 https://blog.torproject.org/new-release-tor-browser-1354/ --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 5283e04db85f..154f70c83e00 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.3"; + version = "13.5.4"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-g4wSjFS3VFZcflN2lexAoSledOBCK9taixGEUbM3X1E="; + hash = "sha256-2gu/JzkLYvYveOM1XvDpyV3dLoixqKvfmyHGIAz8nis="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-sw8PFbCTUvmD1+fE3VXX/3A07CnzXjBydQ+b4rshpak="; + hash = "sha256-BnJuKKwB6VqsHlRCU1cAuuaNdNu56oSE4z4wYXnyy/Q="; }; }; From 5c9338240fc6654462dd34195fca44dc3278847a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 19:59:59 +0000 Subject: [PATCH 058/132] supermariowar: 2023-unstable-2024-07-16 -> 2023-unstable-2024-09-17 --- pkgs/by-name/su/supermariowar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index dd813563ea60..4ebeef24ce7d 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2023-unstable-2024-07-16"; + version = "2023-unstable-2024-09-17"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "0ba445f425d03a444b3814bcd5898590ef8845b9"; - hash = "sha256-4a34m1f7LRA48RZwHLa2Sv3oeTakPZ3ezFv3rEuKmqM="; + rev = "6b8ff8c669ca31a116754d23b6ff65e42ac50733"; + hash = "sha256-P0jV7G81thj0UJoYLd5+H5SjjaVu4goJxc9IkbzxJgs="; fetchSubmodules = true; }; From 696bd353a6f6aa5b4accd95bc8a04852bf5fe6e1 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 16 Sep 2024 08:56:16 +0200 Subject: [PATCH 059/132] pinocchio: set MPLCONFIGDIR in check fix: > Matplotlib created a temporary cache directory at > /private/tmp/nix-build-pinocchio-3.2.0.drv-0/matplotlib-cgeg512t > because the default path (/homeless-shelter/.matplotlib) is not a > writable directory; it is highly recommended to set the MPLCONFIGDIR > environment variable to a writable directory, in particular to speed > up the import of Matplotlib and to better support multiprocessing. --- pkgs/development/libraries/pinocchio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index e03ac9ee854d..33fb913ca9e9 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: { # allow package:// uri use in examples export ROS_PACKAGE_PATH=${example-robot-data}/share + + # silence matplotlib warning + export MPLCONFIGDIR=$(mktemp -d) ''; # CMAKE_BUILD_TYPE defaults to Release in this package, From 4b7ee3013e569488a9b587b9dde7f437e301fcd3 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 16 Sep 2024 09:03:31 +0200 Subject: [PATCH 060/132] pinocchio: use pythonImportsCheckHook --- pkgs/development/libraries/pinocchio/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 33fb913ca9e9..238ae8d46337 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ] ++ lib.optionals pythonSupport [ python3Packages.python + python3Packages.pythonImportsCheckHook ]; propagatedBuildInputs = [ @@ -91,12 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import pinocchio" - ''; + pythonImportsCheck = [ "pinocchio" ]; meta = { description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; From 49518d287b1f3221e6481e88192258f0a93cb690 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:52:06 +0200 Subject: [PATCH 061/132] pinocchio: move to pkgs/by-name --- .../pinocchio/default.nix => by-name/pi/pinocchio/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/pinocchio/default.nix => by-name/pi/pinocchio/package.nix} (100%) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/by-name/pi/pinocchio/package.nix similarity index 100% rename from pkgs/development/libraries/pinocchio/default.nix rename to pkgs/by-name/pi/pinocchio/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03e316163bcd..02e5add33ed2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22977,8 +22977,6 @@ with pkgs; pingvin-share = callPackage ../servers/pingvin-share { }; - pinocchio = callPackage ../development/libraries/pinocchio { }; - pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; From f048cdeba0b5112a95656e87979b168a8384d5c6 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:52:22 +0200 Subject: [PATCH 062/132] pinocchio: format --- pkgs/by-name/pi/pinocchio/package.nix | 87 ++++++++++++++------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index 238ae8d46337..ff1b5cf9572f 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchFromGitHub -, casadi -, cmake -, boost -, eigen -, example-robot-data -, casadiSupport ? true -, collisionSupport ? true -, console-bridge -, jrl-cmakemodules -, hpp-fcl -, urdfdom -, pythonSupport ? false -, python3Packages +{ + lib, + stdenv, + fetchFromGitHub, + casadi, + cmake, + boost, + eigen, + example-robot-data, + casadiSupport ? true, + collisionSupport ? true, + console-bridge, + jrl-cmakemodules, + hpp-fcl, + urdfdom, + pythonSupport ? false, + python3Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -55,32 +56,31 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - python3Packages.pythonImportsCheckHook - ]; + nativeBuildInputs = + [ cmake ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; - propagatedBuildInputs = [ - console-bridge - jrl-cmakemodules - urdfdom - ] ++ lib.optionals (!pythonSupport) [ - boost - eigen - ] ++ lib.optionals (!pythonSupport && collisionSupport) [ - hpp-fcl - ] ++ lib.optionals pythonSupport [ - python3Packages.boost - python3Packages.eigenpy - ] ++ lib.optionals (pythonSupport && collisionSupport) [ - python3Packages.hpp-fcl - ] ++ lib.optionals (!pythonSupport && casadiSupport) [ - casadi - ] ++ lib.optionals (pythonSupport && casadiSupport) [ - python3Packages.casadi - ]; + propagatedBuildInputs = + [ + console-bridge + jrl-cmakemodules + urdfdom + ] + ++ lib.optionals (!pythonSupport) [ + boost + eigen + ] + ++ lib.optionals (!pythonSupport && collisionSupport) [ hpp-fcl ] + ++ lib.optionals pythonSupport [ + python3Packages.boost + python3Packages.eigenpy + ] + ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.hpp-fcl ] + ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ] + ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ]; checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ]; @@ -98,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nim65s wegank ]; + maintainers = with lib.maintainers; [ + nim65s + wegank + ]; platforms = lib.platforms.unix; }; }) From da033dc206c64ba954d740f7f982db5028a19cfa Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 12:20:46 +0200 Subject: [PATCH 063/132] pinocchio: build documentation --- pkgs/by-name/pi/pinocchio/package.nix | 32 ++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index ff1b5cf9572f..e754078a3805 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -1,20 +1,22 @@ { - lib, - stdenv, - fetchFromGitHub, - casadi, - cmake, boost, - eigen, - example-robot-data, + casadi, casadiSupport ? true, + cmake, collisionSupport ? true, console-bridge, - jrl-cmakemodules, + doxygen, + eigen, + example-robot-data, + fetchFromGitHub, hpp-fcl, - urdfdom, + jrl-cmakemodules, + lib, + pkg-config, pythonSupport ? false, python3Packages, + stdenv, + urdfdom, }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8V+n1TwFojXKOVkGG8k9aXVadt2NBFlZKba93L+NRNU="; }; + outputs = [ + "out" + "doc" + ]; + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ @@ -57,7 +64,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; nativeBuildInputs = - [ cmake ] + [ + cmake + doxygen + pkg-config + ] ++ lib.optionals pythonSupport [ python3Packages.python python3Packages.pythonImportsCheckHook @@ -89,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) ]; doCheck = true; From 1e402edf61e73d7c77ef57b316a101e76bdb850e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 1 Jul 2024 14:20:50 +0200 Subject: [PATCH 064/132] example-robot-data: propagate pinocchio --- pkgs/development/libraries/example-robot-data/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index d4211be982ef..39ccda1b6309 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.python ]; - buildInputs = lib.optionals pythonSupport [ + propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; From b94714421b4bcc18f7d2449c8f56f54e75ae2527 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 16:15:13 +0200 Subject: [PATCH 065/132] example-robot-data: use pythonImportsCheckHook --- pkgs/development/libraries/example-robot-data/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index 39ccda1b6309..a67c16cf0a4e 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ] ++ lib.optionals pythonSupport [ python3Packages.python + python3Packages.pythonImportsCheckHook ]; propagatedBuildInputs = lib.optionals pythonSupport [ From 85e430220204641cf2f7da5f635a3d0936b991b5 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 16:15:44 +0200 Subject: [PATCH 066/132] example-robot-data: clean cmakeFlags --- pkgs/development/libraries/example-robot-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index a67c16cf0a4e..551d7b72479d 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pinocchio ]; - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_PYTHON_INTERFACE=OFF" + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; doCheck = true; From 1fd7006d7b5eaa6c28f9d748fb73bf6117571503 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 16:16:39 +0200 Subject: [PATCH 067/132] example-robot-data: move to pkgs/by-name --- .../default.nix => by-name/ex/example-robot-data/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/example-robot-data/default.nix => by-name/ex/example-robot-data/package.nix} (100%) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/by-name/ex/example-robot-data/package.nix similarity index 100% rename from pkgs/development/libraries/example-robot-data/default.nix rename to pkgs/by-name/ex/example-robot-data/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02e5add33ed2..ab75913571da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19832,8 +19832,6 @@ with pkgs; libesmtp = callPackage ../development/libraries/libesmtp { }; - example-robot-data = callPackage ../development/libraries/example-robot-data { }; - exiv2 = callPackage ../development/libraries/exiv2 { }; expat = callPackage ../development/libraries/expat { }; From 9d0031ed340620c104b2d1f8a3069a110804b535 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 16:16:53 +0200 Subject: [PATCH 068/132] example-robot-data: format --- .../by-name/ex/example-robot-data/package.nix | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index 551d7b72479d..a63fafed7fd4 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pythonSupport ? false -, python3Packages +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pythonSupport ? false, + python3Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -31,35 +32,32 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - python3Packages.pythonImportsCheckHook - ]; + nativeBuildInputs = + [ cmake ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; - propagatedBuildInputs = lib.optionals pythonSupport [ - python3Packages.pinocchio - ]; + propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; doCheck = true; # The package expect to find an `example-robot-data/robots` folder somewhere # either in install prefix or in the sources # where it can find the meshes for unit tests preCheck = "ln -s source ../../${finalAttrs.pname}"; - pythonImportsCheck = [ - "example_robot_data" - ]; + pythonImportsCheck = [ "example_robot_data" ]; meta = with lib; { description = "Set of robot URDFs for benchmarking and developed examples"; homepage = "https://github.com/Gepetto/example-robot-data"; license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; + maintainers = with maintainers; [ + nim65s + wegank + ]; platforms = platforms.unix; }; }) From e84ff8070a8e9860c7d2d1ac4a6679d6cba975fc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 12:17:20 +0200 Subject: [PATCH 069/132] example-robot-data: build documentation --- .../by-name/ex/example-robot-data/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index a63fafed7fd4..63331bbf5a84 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -1,11 +1,13 @@ { - lib, - stdenv, + cmake, + doxygen, fetchFromGitHub, fetchpatch, - cmake, + lib, + pkg-config, pythonSupport ? false, python3Packages, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -20,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI="; }; + outputs = [ + "out" + "doc" + ]; + strictDeps = true; patches = [ @@ -33,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = - [ cmake ] + [ + cmake + doxygen + pkg-config + ] ++ lib.optionals pythonSupport [ python3Packages.python python3Packages.pythonImportsCheckHook From 5c9dd453f88acc4b731ac653d67873a83cd28f32 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:53:08 +0200 Subject: [PATCH 070/132] crocoddyl: use pythonImportsCheckHook --- pkgs/development/libraries/crocoddyl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 046a6a014d1a..ac6efdc90c89 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ] ++ lib.optionals pythonSupport [ python3Packages.python + python3Packages.pythonImportsCheckHook ]; propagatedBuildInputs = lib.optionals (!pythonSupport) [ From 17d7e76bbdd31d6cc2be1d9705b8d8dcfee3de41 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:54:22 +0200 Subject: [PATCH 071/132] crocoddyl: move to pkgs/by-name --- .../crocoddyl/default.nix => by-name/cr/crocoddyl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/crocoddyl/default.nix => by-name/cr/crocoddyl/package.nix} (100%) diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/by-name/cr/crocoddyl/package.nix similarity index 100% rename from pkgs/development/libraries/crocoddyl/default.nix rename to pkgs/by-name/cr/crocoddyl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab75913571da..9ae026075589 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19663,8 +19663,6 @@ with pkgs; croaring = callPackage ../development/libraries/croaring { }; - crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = callPackage ../development/libraries/crossguid { }; cryptopp = callPackage ../development/libraries/crypto++ { }; From f13a44ac822377063ed16e3f51088241ec12793b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:54:31 +0200 Subject: [PATCH 072/132] crocoddyl: format --- pkgs/by-name/cr/crocoddyl/package.nix | 58 ++++++++++++++------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index ac6efdc90c89..dba1442ac0ae 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, example-robot-data -, pinocchio -, pythonSupport ? false -, python3Packages +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + example-robot-data, + pinocchio, + pythonSupport ? false, + python3Packages, }: stdenv.mkDerivation (finalAttrs: { @@ -21,20 +22,22 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals pythonSupport [ - python3Packages.python - python3Packages.pythonImportsCheckHook - ]; + nativeBuildInputs = + [ cmake ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; - propagatedBuildInputs = lib.optionals (!pythonSupport) [ - example-robot-data - pinocchio - ] ++ lib.optionals pythonSupport [ - python3Packages.example-robot-data - python3Packages.pinocchio - ]; + propagatedBuildInputs = + lib.optionals (!pythonSupport) [ + example-robot-data + pinocchio + ] + ++ lib.optionals pythonSupport [ + python3Packages.example-robot-data + python3Packages.pinocchio + ]; cmakeFlags = lib.optionals (!pythonSupport) [ "-DBUILD_EXAMPLES=OFF" @@ -49,18 +52,17 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = true; - pythonImportsCheck = [ - "crocoddyl" - ]; - checkInputs = lib.optionals pythonSupport [ - python3Packages.scipy - ]; + pythonImportsCheck = [ "crocoddyl" ]; + checkInputs = lib.optionals pythonSupport [ python3Packages.scipy ]; meta = with lib; { description = "Crocoddyl optimal control library"; homepage = "https://github.com/loco-3d/crocoddyl"; license = licenses.bsd3; - maintainers = with maintainers; [ nim65s wegank ]; + maintainers = with maintainers; [ + nim65s + wegank + ]; platforms = platforms.unix; }; }) From a8dfcd8732924e10ff3c79a2ade4d9953fdaeced Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 11:52:04 +0200 Subject: [PATCH 073/132] crocoddyl: build documentation --- pkgs/by-name/cr/crocoddyl/package.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index dba1442ac0ae..28f59d44d3e4 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -1,12 +1,14 @@ { - lib, - stdenv, - fetchFromGitHub, cmake, + doxygen, example-robot-data, + fetchFromGitHub, + lib, pinocchio, + pkg-config, pythonSupport ? false, python3Packages, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -20,10 +22,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; }; + outputs = [ + "out" + "doc" + ]; + strictDeps = true; nativeBuildInputs = - [ cmake ] + [ + cmake + doxygen + pkg-config + ] ++ lib.optionals pythonSupport [ python3Packages.python python3Packages.pythonImportsCheckHook @@ -39,9 +50,10 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pinocchio ]; - cmakeFlags = lib.optionals (!pythonSupport) [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_PYTHON_INTERFACE=OFF" + cmakeFlags = [ + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; prePatch = '' From f25bd60c8acd77ce2942ec3cc3262a9cb3ca59c0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 11:52:42 +0200 Subject: [PATCH 074/132] crocoddyl: update substituteInPlace use --- pkgs/by-name/cr/crocoddyl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index 28f59d44d3e4..3dd3058460ff 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace \ examples/CMakeLists.txt \ examples/log/check_logfiles.sh \ - --replace /bin/bash ${stdenv.shell} + --replace-fail /bin/bash ${stdenv.shell} ''; doCheck = true; From a2e568bb557fed13aec0de8f815a3c95bb50b6e9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 12:08:41 +0200 Subject: [PATCH 075/132] crocoddyl: add optional dependencies --- pkgs/by-name/cr/crocoddyl/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index 3dd3058460ff..a1a283727743 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -1,8 +1,11 @@ { + blas, cmake, doxygen, example-robot-data, fetchFromGitHub, + ipopt, + lapack, lib, pinocchio, pkg-config, @@ -41,13 +44,19 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = - lib.optionals (!pythonSupport) [ + [ + blas + ipopt + lapack + ] + ++ lib.optionals (!pythonSupport) [ example-robot-data pinocchio ] ++ lib.optionals pythonSupport [ python3Packages.example-robot-data python3Packages.pinocchio + python3Packages.scipy ]; cmakeFlags = [ From 641aa81f638b75ab44b2220441c39c5084f22707 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 15:56:10 +0200 Subject: [PATCH 076/132] eiquadprog: set platforms --- pkgs/by-name/ei/eiquadprog/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix index 9380e7f9d2bf..40696872fce9 100644 --- a/pkgs/by-name/ei/eiquadprog/package.nix +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/stack-of-tasks/eiquadprog/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) From 784a937962b8488ca51aaecaa6232d0efa5fe0a2 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 12:14:59 +0200 Subject: [PATCH 077/132] eiquadprog: build documentation --- pkgs/by-name/ei/eiquadprog/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix index 40696872fce9..70242a2aa9a0 100644 --- a/pkgs/by-name/ei/eiquadprog/package.nix +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -1,10 +1,12 @@ { boost, cmake, + doxygen, eigen, fetchFromGitHub, jrl-cmakemodules, lib, + pkg-config, stdenv, }: @@ -19,8 +21,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk="; }; + outputs = [ + "out" + "doc" + ]; + nativeBuildInputs = [ cmake + doxygen + pkg-config jrl-cmakemodules ]; propagatedBuildInputs = [ eigen ]; From 26f9c195cc10d412e01fb97afdf9f56e07057dd3 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 23:28:08 +0200 Subject: [PATCH 078/132] tsid: set platforms --- pkgs/by-name/ts/tsid/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index 054857f8b222..80a5e1346bf2 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/stack-of-tasks/tsid"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; }) From ad86b6f652c493cf8a7715b8eccdd5512d52c0b1 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 23:28:46 +0200 Subject: [PATCH 079/132] tsid: use pythonImportsCheckHook --- pkgs/by-name/ts/tsid/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index 80a5e1346bf2..d1413f072d2e 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -36,11 +36,16 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - nativeBuildInputs = [ - doxygen - cmake - pkg-config - ] ++ lib.optional pythonSupport python3Packages.python; + nativeBuildInputs = + [ + doxygen + cmake + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ @@ -51,11 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!pythonSupport) pinocchio ++ lib.optional pythonSupport python3Packages.pinocchio; doCheck = true; - # pythonImportsCheck, but in stdenv.mkDerivation - postInstall = lib.optionalString pythonSupport '' - PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - python -c "import tsid" - ''; + pythonImportsCheck = [ "tsid" ]; meta = { description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio"; From c2a7f3309661ddc008553e891360c65e0c283200 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 18 Sep 2024 23:29:14 +0200 Subject: [PATCH 080/132] tsid: outputs out first --- pkgs/by-name/ts/tsid/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index d1413f072d2e..0bd4b08b6025 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ]; outputs = [ - "doc" "out" + "doc" ]; nativeBuildInputs = From 22e19d0b933f6ca61b9f2221e96d7a5a66f17090 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 12 Sep 2024 11:32:04 +0200 Subject: [PATCH 081/132] aligator: init at v0.7.0 --- pkgs/by-name/al/aligator/package.nix | 97 ++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 102 insertions(+) create mode 100644 pkgs/by-name/al/aligator/package.nix diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix new file mode 100644 index 000000000000..8b0eb712ce2e --- /dev/null +++ b/pkgs/by-name/al/aligator/package.nix @@ -0,0 +1,97 @@ +{ + cmake, + crocoddyl, + doxygen, + fetchFromGitHub, + fmt, + fontconfig, + gbenchmark, + graphviz, + lib, + llvmPackages, # llvm/Support/Host.h required by casadi 3.6.5 and not available in llvm 18 + pinocchio, + pkg-config, + proxsuite-nlp, + python3Packages, + pythonSupport ? false, + stdenv, + suitesparse, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aligator"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Simple-Robotics"; + repo = "aligator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-397WWL3hb5Q/mic54s5LUuz54bh7vwG53WIq5ljDe7g="; + }; + + outputs = [ + "doc" + "out" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + doxygen + cmake + graphviz + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = [ fmt ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + [ suitesparse ] + ++ lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.matplotlib + python3Packages.pinocchio + python3Packages.proxsuite-nlp + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + pinocchio + proxsuite-nlp + ]; + checkInputs = + [ gbenchmark ] + ++ lib.optionals pythonSupport [ + python3Packages.matplotlib + python3Packages.pytest + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true) + (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true) + (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true) + (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true) + (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ + # ignore one failing test for now + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-integrators") + ]; + + # Fontconfig error: Cannot load default config file: No such file: (null) + env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + # Fontconfig error: No writable cache directories + preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + + doCheck = true; + pythonImportsCheck = [ "aligator" ]; + + meta = { + description = "Versatile and efficient framework for constrained trajectory optimization"; + homepage = "https://github.com/Simple-Robotics/aligator"; + changelog = "https://github.com/Simple-Robotics/aligator/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e673f7f6a83..e4468a54ad4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -521,6 +521,11 @@ self: super: with self; { algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + aligator = toPythonModule (pkgs.aligator.override { + python3Packages = self; + pythonSupport = true; + }); + alive-progress = callPackage ../development/python-modules/alive-progress { }; aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { }; From 88ebafd31da4dc96ad59d736f0031d59ae97f624 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 12 Sep 2024 23:45:33 +0000 Subject: [PATCH 082/132] xen: allow importing the entire meta section from versionDefinition Also makes it slightly more readable by adding line breaks between attributes and reordering the knownVulnerabilities attribute to be closer to the maintainers attribute, as they have similar checks. Signed-off-by: Fernando Rodrigues --- .../virtualization/xen/generic/default.nix | 158 ++++++++++-------- 1 file changed, 87 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix index 4c879e38d2a8..b50eb25c4651 100644 --- a/pkgs/applications/virtualization/xen/generic/default.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -640,77 +640,93 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = { - inherit branch; - # Short description for Xen. - description = - "Xen Hypervisor" - # The "and related components" addition is automatically hidden if said components aren't being built. - + lib.strings.optionalString (prefetchedSources != { }) " and related components" - # To alter the description inside the paranthesis, edit ./packages.nix. - + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + meta = + if + !(lib.attrsets.hasAttrByPath [ "meta" - "description" - ] packageDefinition) " (${packageDefinition.meta.description})"; - # Long description for Xen. - longDescription = - # Starts with the longDescription from ./packages.nix. - (packageDefinition.meta.longDescription or "") - + lib.strings.optionalString (!withInternalQEMU) ( - "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" - + lib.strings.optionalString latest " or `qemu_xen`" - + ".\n" - ) - # Then, if any of the optional with* components are being built, add the "Includes:" string. - + - lib.strings.optionalString - ( - withInternalQEMU - || withInternalSeaBIOS - || withInternalOVMF - || withInternalIPXE - || withEFI - || withFlask + ] versionDefinition) + then + { + inherit branch; + + # Short description for Xen. + description = + "Xen Hypervisor" + # The "and related components" addition is automatically hidden if said components aren't being built. + + lib.strings.optionalString (prefetchedSources != { }) " and related components" + # To alter the description inside the paranthesis, edit ./packages.nix. + + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + "meta" + "description" + ] packageDefinition) " (${packageDefinition.meta.description})"; + + # Long description for Xen. + longDescription = + # Starts with the longDescription from ./packages.nix. + (packageDefinition.meta.longDescription or "") + + lib.strings.optionalString (!withInternalQEMU) ( + "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" + + lib.strings.optionalString latest " or `qemu_xen`" + + ".\n" ) - ( - "\nIncludes:" - # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't - # that many optional components, we just use lib.strings.optionalString, because it's simpler. - # Optional components that aren't being built are automatically hidden. - + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." - + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." - + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)." - + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." - + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." - + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)." - ) - # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. - # This will hopefully give users the peace of mind that their Xen is secure, without needing - # to search the source code for the XSA patches. - + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( - "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n" - + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) - ); - homepage = "https://xenproject.org/"; - downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; - changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; - license = with lib.licenses; [ - # Documentation. - cc-by-40 - # Most of Xen is licensed under the GPL v2.0. - gpl2Only - # Xen Libraries and the `xl` command-line utility. - lgpl21Only - # Development headers in $dev/include. - mit - ]; - # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. - maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( - with lib.maintainers; [ sigmasquadron ] - ); - mainProgram = "xl"; - # Evaluates to x86_64-linux. - platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; - knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; - }; + # Then, if any of the optional with* components are being built, add the "Includes:" string. + + + lib.strings.optionalString + ( + withInternalQEMU + || withInternalSeaBIOS + || withInternalOVMF + || withInternalIPXE + || withEFI + || withFlask + ) + ( + "\nIncludes:" + # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't + # that many optional components, we just use lib.strings.optionalString, because it's simpler. + # Optional components that aren't being built are automatically hidden. + + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)." + + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." + + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." + + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)." + ) + # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. + # This will hopefully give users the peace of mind that their Xen is secure, without needing + # to search the source code for the XSA patches. + + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( + "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n" + + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) + ); + + homepage = "https://xenproject.org/"; + downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; + changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; + + license = with lib.licenses; [ + # Documentation. + cc-by-40 + # Most of Xen is licensed under the GPL v2.0. + gpl2Only + # Xen Libraries and the `xl` command-line utility. + lgpl21Only + # Development headers in $dev/include. + mit + ]; + + # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. + maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( + with lib.maintainers; [ sigmasquadron ] + ); + knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; + + mainProgram = "xl"; + + # Evaluates to x86_64-linux. + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + + } + else + versionDefinition.meta; }) From 5692ac2d21e45d344f2a3a5652f4c349c5e5e2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Tue, 17 Sep 2024 01:49:40 +0300 Subject: [PATCH 083/132] arti: 1.2.6 -> 1.2.7 Update the package to the latest version. The test were modified / skipped after the release to fix the following issues that affect the current release. https://gitlab.torproject.org/tpo/core/arti/-/issues/1589 https://gitlab.torproject.org/tpo/core/arti/-/issues/1607 --- pkgs/tools/security/arti/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 392744dd5d5f..21d8ee4ae154 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-3/wXxcKjbvlXUjvGgMidORVgeo2c5IuPgjLnY2Nj9oU="; + hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo="; }; - cargoHash = "sha256-UeMZlBSbeH/dn5j9vxNkZQ3vkNOxIyPLUOcZe2ZllTM="; + cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; @@ -33,6 +33,12 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--package" "arti" ]; + checkFlags = [ + # problematic tests that were fixed after the release + "--skip=reload_cfg::test::watch_single_file" + "--skip=reload_cfg::test::watch_multiple" + ]; + meta = with lib; { description = "Implementation of Tor in Rust"; mainProgram = "arti"; From 93652837da097e2ab5389319b3f044348c66e965 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 18 Sep 2024 22:37:15 +0000 Subject: [PATCH 084/132] xen: simplify inherit calls Instead of using multiple inherit calls, just use a single one. Signed-off-by: Fernando Rodrigues --- .../virtualization/xen/generic/default.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix index b50eb25c4651..e726e7034d0f 100644 --- a/pkgs/applications/virtualization/xen/generic/default.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -98,11 +98,13 @@ let ]; # Inherit attributes from a versionDefinition. - inherit (versionDefinition) pname; - inherit (versionDefinition) branch; - inherit (versionDefinition) version; - inherit (versionDefinition) latest; - inherit (versionDefinition) pkg; + inherit (versionDefinition) + pname + branch + version + latest + pkg + ; # Mark versions older than minSupportedVersion as EOL. minSupportedVersion = "4.17"; @@ -120,8 +122,7 @@ let src = fetchgit { url = "https://xenbits.xen.org/git-http/qemu-xen.git"; fetchSubmodules = true; - inherit (pkg.qemu) rev; - inherit (pkg.qemu) hash; + inherit (pkg.qemu) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; path = "tools/qemu-xen"; @@ -131,8 +132,7 @@ let seaBIOS = { src = fetchgit { url = "https://xenbits.xen.org/git-http/seabios.git"; - inherit (pkg.seaBIOS) rev; - inherit (pkg.seaBIOS) hash; + inherit (pkg.seaBIOS) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" @@ -145,8 +145,7 @@ let src = fetchgit { url = "https://xenbits.xen.org/git-http/ovmf.git"; fetchSubmodules = true; - inherit (pkg.ovmf) rev; - inherit (pkg.ovmf) hash; + inherit (pkg.ovmf) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; path = "tools/firmware/ovmf-dir-remote"; @@ -157,8 +156,7 @@ let src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - inherit (pkg.ipxe) rev; - inherit (pkg.ipxe) hash; + inherit (pkg.ipxe) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; path = "tools/firmware/etherboot/ipxe.git"; @@ -317,8 +315,7 @@ let in stdenv.mkDerivation (finalAttrs: { - inherit pname; - inherit version; + inherit pname version; outputs = [ "out" # TODO: Split $out in $bin for binaries and $lib for libraries. @@ -331,8 +328,7 @@ stdenv.mkDerivation (finalAttrs: { # Main Xen source. src = fetchgit { url = "https://xenbits.xen.org/git-http/xen.git"; - inherit (pkg.xen) rev; - inherit (pkg.xen) hash; + inherit (pkg.xen) rev hash; }; patches = From 29c672a6838e7f154636483ca8947676e31bfa53 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 18 Sep 2024 22:38:55 +0000 Subject: [PATCH 085/132] xen: move from xen.org to xenproject.org xenproject.org is the Xen Project's official domain. xen.org is deprecated and we should avoid referring to Xen as just "xen" whenever possible, due to a messy legal history with Citrix. Signed-off-by: Fernando Rodrigues --- .../virtualization/xen/generic/default.nix | 8 ++++---- pkgs/applications/virtualization/xen/update.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix index e726e7034d0f..c81a13daa99a 100644 --- a/pkgs/applications/virtualization/xen/generic/default.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -120,7 +120,7 @@ let lib.attrsets.optionalAttrs withInternalQEMU { qemu = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; + url = "https://xenbits.xenproject.org/git-http/qemu-xen.git"; fetchSubmodules = true; inherit (pkg.qemu) rev hash; }; @@ -131,7 +131,7 @@ let // lib.attrsets.optionalAttrs withInternalSeaBIOS { seaBIOS = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; + url = "https://xenbits.xenproject.org/git-http/seabios.git"; inherit (pkg.seaBIOS) rev hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ @@ -143,7 +143,7 @@ let // lib.attrsets.optionalAttrs withInternalOVMF { ovmf = { src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; + url = "https://xenbits.xenproject.org/git-http/ovmf.git"; fetchSubmodules = true; inherit (pkg.ovmf) rev hash; }; @@ -327,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: { # Main Xen source. src = fetchgit { - url = "https://xenbits.xen.org/git-http/xen.git"; + url = "https://xenbits.xenproject.org/git-http/xen.git"; inherit (pkg.xen) rev hash; }; diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh index 6ac8ba5a825c..a7318aef0324 100755 --- a/pkgs/applications/virtualization/xen/update.sh +++ b/pkgs/applications/virtualization/xen/update.sh @@ -22,7 +22,7 @@ userInputFingerprint=${userInputFingerprint:-"23E3222C145F4475FA8060A783FE14C957 # Clone xen.git. echo -e "Cloning \e[1;34mxen.git\e[0m..." -git clone --quiet https://xenbits.xen.org/git-http/xen.git /tmp/xenUpdateScript/xen +git clone --quiet https://xenbits.xenproject.org/git-http/xen.git /tmp/xenUpdateScript/xen cd /tmp/xenUpdateScript/xen # Get list of versions and branches. @@ -68,22 +68,22 @@ for version in "${supportedVersions[@]}"; do # Use `nix-prefetch-git` to fetch `rev`s and `hash`es. echo "Pre-fetching sources and determining hashes..." echo -e -n " \e[1;32mXen\e[0m..." - fetchXen=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/xen.git --rev RELEASE-"$version" --quiet) + fetchXen=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/xen.git --rev RELEASE-"$version" --quiet) finalVersion="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" hash="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mQEMU\e[0m..." - fetchQEMU=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) + fetchQEMU=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) finalQEMUVersion="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" qemuHash="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mSeaBIOS\e[0m..." - fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xen.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) + fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) finalSeaBIOSVersion="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" seaBIOSHash="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" echo "done!" echo -e -n " \e[1;36mOVMF\e[0m..." - ovmfHash="$(nix-prefetch-git --url https://xenbits.xen.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" + ovmfHash="$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" echo "done!" echo -e -n " \e[1;36miPXE\e[0m..." ipxeHash="$(nix-prefetch-git --url https://github.com/ipxe/ipxe.git --rev "$ipxeVersion" --quiet | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" From c0afbf32a4f6802546cd5a9c75a20cf0bc51c78e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:46:27 +0200 Subject: [PATCH 086/132] python312Packages.mypy-boto3-ce: 1.35.0 -> 1.35.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index de6d7320f186..3678305fce93 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -182,8 +182,8 @@ rec { "sha256-scTtp5URLSljLwCJHu80+bUBL4LNW8zL+rOa9vBmPJE="; mypy-boto3-ce = - buildMypyBoto3Package "ce" "1.35.0" - "sha256-/nhw7TUfQmFmcm94Omgkp6/zAFGlvZIPCb7hKAtMoEI="; + buildMypyBoto3Package "ce" "1.35.22" + "sha256-1MB5ldBGqYDZMkYaEJ0nK+jM5q/TkcN3wllT1X8YnQc="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.35.0" From e9b992224f03c0ba0cb0d1114cf9b19bbb9e2f25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:47:49 +0200 Subject: [PATCH 087/132] python312Packages.mypy-boto3-codebuild: 1.35.5 -> 1.35.21 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3678305fce93..5d5c45406bfb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-NXttDVG1iAGoYefRXROKaXiQUnRXxiOcOUad7ZuA2xE="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.5" - "sha256-AecAyPT6AQCpezwqoJHCPpORKCdsjCbHBL6i+PKIAis="; + buildMypyBoto3Package "codebuild" "1.35.21" + "sha256-sCIMOBe3VppVALMDc4BV3rK+RYlCbxK80YUKPnckvT8="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.0" From 78ba77940a9624565d175d90747baab7e99aaa3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:48:08 +0200 Subject: [PATCH 088/132] python312Packages.mypy-boto3-ds: 1.35.0 -> 1.35.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5d5c45406bfb..116e2a33de26 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -430,8 +430,8 @@ rec { "sha256-Fzdqwy9NA+R2ZYNuXcxTv5RlY9X1d609CZHbSQUp3Is="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.35.0" - "sha256-B6fR0fPc1vTN+WtsHXyE8gbl87yVd/QdxmmLmtftlxQ="; + buildMypyBoto3Package "ds" "1.35.22" + "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE="; mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.35.15" From a012ace7a418618959fb74015a66fe58568499a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:48:13 +0200 Subject: [PATCH 089/132] python312Packages.mypy-boto3-ecr: 1.35.17 -> 1.35.21 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 116e2a33de26..822748073635 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -454,8 +454,8 @@ rec { "sha256-0Xe77fz+lA+nuUGK+PjU0EgWeQ7AJ9Smsb/4yK1tow0="; mypy-boto3-ecr = - buildMypyBoto3Package "ecr" "1.35.17" - "sha256-puWH6dq/wpO0t2PFGeG7hibi0Jru3ELyOmqrjvCxves="; + buildMypyBoto3Package "ecr" "1.35.21" + "sha256-1+jCQIbOOyWeSsKicfw07U7/3pnHiZrH1kwto8/wrNc="; mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.35.0" From e416efbe63a0e8484066a66819789aa9ccccc100 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:48:15 +0200 Subject: [PATCH 090/132] python312Packages.mypy-boto3-ecs: 1.35.2 -> 1.35.21 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 822748073635..5e5b17bd6aa6 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -462,8 +462,8 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.2" - "sha256-DELGxyFD0U7IEoEXZebyuFuac94pVxWgU2OPK3aiKgA="; + buildMypyBoto3Package "ecs" "1.35.21" + "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" From 531747653f910df07233c475c0631d5561d73184 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:49:29 +0200 Subject: [PATCH 091/132] python312Packages.mypy-boto3-guardduty: 1.35.17 -> 1.35.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5e5b17bd6aa6..9ca7c8e09dc0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.17" - "sha256-OAA5OwjH4oXVV908NXoiXS6M87LwDf1IIrPDTTRzo58="; + buildMypyBoto3Package "guardduty" "1.35.22" + "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" From 6541015d59f9159d5e1de9e15f94833a4a99c3d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:49:53 +0200 Subject: [PATCH 092/132] python312Packages.mypy-boto3-lambda: 1.35.3 -> 1.35.21 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9ca7c8e09dc0..0557619cac97 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -770,8 +770,8 @@ rec { "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.3" - "sha256-LnjBKnuk0tnJm3X61YgE/ZmCDpVKtVfxTwmdbIWogqs="; + buildMypyBoto3Package "lambda" "1.35.21" + "sha256-2iXqAE6PaXYQCKciSnfXwlYY3Bo+NdPi62ii3wmVLVk="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" From f3bb7122e399fc2eae80682945a1259e710324b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:53:29 +0200 Subject: [PATCH 093/132] python312Packages.pytenable: 1.5.0 -> 1.5.1 Changelog: https://github.com/tenable/pyTenable/releases/tag/1.5.1 --- .../python-modules/pytenable/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 0eb36db86388..67b963f50f92 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,18 +1,22 @@ { lib, buildPythonPackage, + cryptography, defusedxml, fetchFromGitHub, + gql, + graphql-core, marshmallow, + pytest-cov-stub, pytest-datafiles, pytest-vcr, pytestCheckHook, python-box, python-dateutil, pythonOlder, - requests, requests-pkcs12, requests-toolbelt, + requests, responses, restfly, semver, @@ -22,7 +26,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,10 +35,13 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-uLZ1TQx5awHOOF+IR3aWTwwYTd71O/V+EHaDrb1LAXU="; + hash = "sha256-xiFpwwlQfhpljRbJeytO3Sjh4ue0cSpKgJ9bqUul7rk="; }; - pythonRelaxDeps = [ "defusedxml" ]; + pythonRelaxDeps = [ + "cryptography" + "defusedxml" + ]; build-system = [ setuptools ]; @@ -42,6 +49,9 @@ buildPythonPackage rec { defusedxml marshmallow python-box + cryptography + gql + graphql-core python-dateutil requests requests-toolbelt @@ -51,6 +61,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-cov-stub pytest-datafiles pytest-vcr pytestCheckHook From ef2faa55150a0dceab2693782fb79c7f9690e552 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:53:47 +0200 Subject: [PATCH 094/132] python312Packages.mypy-boto3-rds: 1.35.20 -> 1.35.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0557619cac97..abee4e02d776 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.20" - "sha256-sjAaaFf5Lvb2EXbjxBNoBskNLGRIXxddaVZ2zgkImbU="; + buildMypyBoto3Package "rds" "1.35.22" + "sha256-moU0RLvQFknHPerOQcvXSZw+9CdZ/5Yeno4dZVoXfNo="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.0" From be8f4bc5cfbec947b96786b1b7b0431a64845750 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:54:04 +0200 Subject: [PATCH 095/132] python312Packages.mypy-boto3-s3: 1.35.16 -> 1.35.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index abee4e02d776..99a6a91690f9 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.16" - "sha256-WZVn4yfqq+TN0MImwHyshQQx0EgWarpJwqFiAx7EiTQ="; + buildMypyBoto3Package "s3" "1.35.22" + "sha256-n2ThGW/+zCxqt77pXoSGkrX0ZKHfFCETYepru8IDg4c="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.12" From 25cf17169eca67057baa255c1c2518b218f7dcee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:54:36 +0200 Subject: [PATCH 096/132] python312Packages.mypy-boto3-ssm: 1.35.0 -> 1.35.21 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 99a6a91690f9..22b86b063e7b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1294,8 +1294,8 @@ rec { "sha256-YXUvHCvy76OBX2TUPCW0o529vZ5HKuSKoY18bSp6brg="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.35.0" - "sha256-07yY7lzE2hSaTvIQCU+YWoTE1PenxJnsXGsEHfJ6EJc="; + buildMypyBoto3Package "ssm" "1.35.21" + "sha256-XtVcdQn63aYVVxj+WXKbPasPi3b/HgN6h6v/ndJHX0k="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.35.0" From 5bda11585e507d1a68fdac6286302396a6b88d1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:57:13 +0200 Subject: [PATCH 097/132] python312Packages.rns: 0.7.7 -> 0.7.8 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.7.7...0.7.8 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.7.8 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 0dd92d28305f..ccf537e9a20e 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.7"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-cNOVk7JCu4kMevH9MAWWvtLIzfbBBy+h7bhTBhkfrvI="; + hash = "sha256-2UXkfijLeMOpyurR1Bz0dbQxKO7efRp3UcqXIUWRjs0="; }; patches = [ From edbb5cf7ddbe5ed52c17a3a6728a837ce918c565 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:57:30 +0200 Subject: [PATCH 098/132] python312Packages.lxmf: 0.5.1 -> 0.5.2 Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.5.1...0.5.2 Changelog: https://github.com/markqvist/LXMF/releases/tag/0.5.2 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 935fbf9cfd63..0ed85923b693 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-RYPWdFDZvvLJVCSQPXdJw0xMrUN3Kr8QRWTYZfBB9og="; + hash = "sha256-VUXKgAzz6kdCcMJHDIMx4sIj6dLqz+GHas2z6RFRSdA="; }; build-system = [ setuptools ]; From e10ed5256ccbde0af8d1adfe47d68c2f29d57a04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Sep 2024 00:57:55 +0200 Subject: [PATCH 099/132] python312Packages.nomadnet: 0.5.2 -> 0.5.3 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.5.2...0.5.3 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.5.3 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 237329f8eddd..34dd91898287 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-4CT5WBpWoK7c8bS7hw0F5mL8MDg8ud+f3SITC5lEVFM="; + hash = "sha256-7LzReT1iuCbZYNJWjDriMaCljLzpyKWfCX6HjTt18ls="; }; build-system = [ setuptools ]; From d69eafbf4856045ba6fea3bf6c1989aa06813fea Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 17 Sep 2024 11:56:42 +0200 Subject: [PATCH 100/132] proxsuite-nlp: 0.7.1 -> 0.8.0 Diff: https://github.com/Simple-Robotics/proxsuite-nlp/compare/v0.7.1...v0.8.0 Changelog: https://github.com/Simple-Robotics/proxsuite-nlp/blob/v0.8.0/CHANGELOG.md --- pkgs/by-name/pr/proxsuite-nlp/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index 234cc93febc7..211d9a634063 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-aMTEjAu1ltjorx5vhz7klB0cGgdm+7STAPhi+NA6mnI="; + hash = "sha256-Dy8+pPTv/B6vVdpGndVOV16WSLiENJfaIrn1+FYwcI0="; }; outputs = [ @@ -37,14 +37,8 @@ stdenv.mkDerivation (finalAttrs: { # Fix use of system jrl-cmakemodules # This patch was merged upstream and can be removed on next release (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/106/commits/c653ab67860fdf7b53b1a919f0b8a7746eba016b.patch"; - hash = "sha256-Kw2obJGOWms/Lr4cVkLFpaLTickCq5WQyDVbwi8Bd58="; - }) - # Fix use of system EigenRand - # This patch was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/106/commits/25370417755f003708b5b2b81e253797e8d96928.patch"; - hash = "sha256-PKijVmttt5JakF3X/GiVWptncxHJUbs/aikgwgB5NME="; + url = "https://github.com/Simple-Robotics/proxsuite-nlp/pull/109/commits/9bf741ce6010052a773071472891f42adc6cbbea.patch"; + hash = "sha256-sluMVrTw7EXLFa0dqkoZTkpGjKe7zODqIqbJxCdfSwY="; }) ]; From 4908d90b1a8c7a4f4a5400fe3e8b67c009f46b24 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 19 Sep 2024 01:14:04 +0200 Subject: [PATCH 101/132] proxsuite-nlp: outputs out first --- pkgs/by-name/pr/proxsuite-nlp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index 211d9a634063..194ff2fe967d 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ - "doc" "out" + "doc" ]; patches = [ From 08c9dcf9621a1f85ef29d8ac12d4c08040d2840d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 19 Sep 2024 01:15:50 +0200 Subject: [PATCH 102/132] aligator: 0.7.0 -> 0.8.0 Diff: https://github.com/Simple-Robotics/aligator/compare/v0.7.0...v0.8.0 Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.8.0/CHANGELOG.md --- pkgs/by-name/al/aligator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 8b0eb712ce2e..53346434be78 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; rev = "v${finalAttrs.version}"; - hash = "sha256-397WWL3hb5Q/mic54s5LUuz54bh7vwG53WIq5ljDe7g="; + hash = "sha256-o4QjxTaZUa17hZsCv4hCI2cedaHoojBtLe8SVUkl0bo="; }; outputs = [ From 15c45598e232e37cc140fa3381bd3412a266e918 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 11 Sep 2024 10:51:36 +0800 Subject: [PATCH 103/132] turn-rs: init at 3.1.0 --- pkgs/by-name/tu/turn-rs/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/tu/turn-rs/package.nix diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix new file mode 100644 index 000000000000..f8718aeefd73 --- /dev/null +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -0,0 +1,32 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "turn-rs"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mycrl"; + repo = "turn-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-uXMRDgSHrwT6+kejWRSE1WjXO8LaOR+fnffIXcL3A4I="; + }; + + cargoHash = "sha256-gO2vuOQMvl6KYp529k3CYDyma5ECzOr/lcSvP4OpUUo="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Pure rust implemented turn server"; + homepage = "https://github.com/mycrl/turn-rs"; + changelog = "https://github.com/mycrl/turn-rs/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "turn-server"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +} From 1a742a9f80225738c26ffabd9a1cbbb2c02232dc Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 11 Sep 2024 10:51:45 +0800 Subject: [PATCH 104/132] nixos/turn-rs: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/turn-rs.nix | 86 +++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/turn-rs.nix | 65 +++++++++++++++++++ pkgs/by-name/tu/turn-rs/package.nix | 6 +- 5 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/misc/turn-rs.nix create mode 100644 nixos/tests/turn-rs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 006cdeedcaf6..34168ade7956 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -856,6 +856,7 @@ ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix + ./services/misc/turn-rs.nix ./services/misc/tuxclocker.nix ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix diff --git a/nixos/modules/services/misc/turn-rs.nix b/nixos/modules/services/misc/turn-rs.nix new file mode 100644 index 000000000000..b591205417fb --- /dev/null +++ b/nixos/modules/services/misc/turn-rs.nix @@ -0,0 +1,86 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.turn-rs; + format = pkgs.formats.toml { }; +in +{ + options.services.turn-rs = { + enable = lib.mkEnableOption "turn-rs server"; + package = lib.mkPackageOption pkgs "turn-rs" { }; + + secretFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/turn-rs.env"; + description = '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: `$ENVIRONMENT` or + `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + }; + description = "Turn-rs server config file"; + default = { }; + example = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials = { + user1 = "test"; + user2 = "test"; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.turn-rs.settings = { + api.bind = lib.mkDefault "127.0.0.1:3000"; + log.level = lib.mkDefault "info"; + }; + + systemd.services.turn-rs = { + enable = true; + wantedBy = [ "multi-user.target" ]; + description = "Turn-rs Server Daemon"; + preStart = + let + configFile = format.generate "turn-rs-config.toml" cfg.settings; + in + '' + ${lib.getExe pkgs.envsubst} -i "${configFile}" -o /run/turn-rs/config.toml + ''; + serviceConfig = { + RuntimeDirectory = "turn-rs"; + EnvironmentFile = lib.optional (cfg.secretFile != null) cfg.secretFile; + ExecStart = "${lib.getExe cfg.package} --config=/run/turn-rs/config.toml"; + DynamicUser = true; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 22bedb8d8269..f84c03d87e31 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1045,6 +1045,7 @@ in { txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; + turn-rs = handleTest ./turn-rs.nix {}; tuxguitar = handleTest ./tuxguitar.nix {}; twingate = runTest ./twingate.nix; typesense = handleTest ./typesense.nix {}; diff --git a/nixos/tests/turn-rs.nix b/nixos/tests/turn-rs.nix new file mode 100644 index 000000000000..750a141c224a --- /dev/null +++ b/nixos/tests/turn-rs.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + { + name = "turn-rs"; + + nodes = { + server = { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.turn-rs = { + enable = true; + secretFile = pkgs.writeText "secret" '' + USER_1_CREDS="foobar" + ''; + settings = { + turn = { + realm = "localhost"; + interfaces = [ + { + transport = "udp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + { + transport = "tcp"; + bind = "127.0.0.1:3478"; + external = "127.0.0.1:3478"; + } + ]; + }; + + auth.static_credentials.user1 = "$USER_1_CREDS"; + }; + }; + }; + }; + + testScript = # python + '' + import json + + start_all() + server.wait_for_unit('turn-rs.service') + server.wait_for_open_port(3000, "127.0.0.1") + + info = server.succeed('curl http://localhost:3000/info') + jsonInfo = json.loads(info) + assert len(jsonInfo['interfaces']) == 2, f'Interfaces doesn\'t contain two entries:\n{json.dumps(jsonInfo, indent=2)}' + + config = server.succeed('cat /run/turn-rs/config.toml') + assert 'foobar' in config, f'Secrets are not properly injected:\n{config}' + ''; + } +) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index f8718aeefd73..f2f5d863c688 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage rec { @@ -18,7 +19,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gO2vuOQMvl6KYp529k3CYDyma5ECzOr/lcSvP4OpUUo="; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.nixos = nixosTests.turn-rs; + }; meta = { description = "Pure rust implemented turn server"; From 3339af8a4844f9ad48d42a609330caa2a0020fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Sep 2024 17:23:45 -0700 Subject: [PATCH 105/132] python312Packages.jaraco-test: 5.4.0 -> 5.5.1 Diff: https://github.com/jaraco/jaraco.test/compare/refs/tags/v5.4.0...v5.5.1 Changelog: https://github.com/jaraco/jaraco.test/blob/v5.5.1/NEWS.rst --- .../python-modules/jaraco-test/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index ae018f6f8305..47510c9c4a6e 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, setuptools-scm, toml, jaraco-functools, @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.4.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "jaraco.test"; - inherit version; - hash = "sha256-29NDh4dYrcVER9YRXEYXia2zH8QHOyEpUCQwk7oxfsI="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.test"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbnU6PFVUd/eD9CWHyJvaTFkcZaIIwztkN9UbQZH1RU="; }; build-system = [ setuptools-scm ]; @@ -47,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Testing support by jaraco"; homepage = "https://github.com/jaraco/jaraco.test"; - changelog = "https://github.com/jaraco/jaraco.test/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/jaraco.test/blob/${src.rev}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 293dd6c11fe60f1e90aa44a4cfe4fc9b40582e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 14 Jul 2024 06:32:55 +0200 Subject: [PATCH 106/132] paperoni: drop Package hasn't see any package and is still marked as alpha. We don't have any maintainer for this package either. --- pkgs/tools/text/paperoni/Cargo.lock | 3014 -------------------------- pkgs/tools/text/paperoni/default.nix | 52 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 3068 deletions(-) delete mode 100644 pkgs/tools/text/paperoni/Cargo.lock delete mode 100644 pkgs/tools/text/paperoni/default.nix diff --git a/pkgs/tools/text/paperoni/Cargo.lock b/pkgs/tools/text/paperoni/Cargo.lock deleted file mode 100644 index e08a993ea54a..000000000000 --- a/pkgs/tools/text/paperoni/Cargo.lock +++ /dev/null @@ -1,3014 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher", -] - -[[package]] -name = "aes-gcm" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher", - "opaque-debug", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log 0.4.17", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log 0.4.17", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log 0.4.17", -] - -[[package]] -name = "bumpalo" -version = "3.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", - "yaml-rust", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "comfy-table" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c93d79ba722818d1a6aedfbe2cf4889330c856d0c6772951efbbf3dd283c070a" -dependencies = [ - "crossterm", - "strum", - "strum_macros", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac", - "percent-encoding", - "rand 0.8.5", - "sha2", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot 0.11.2", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" -dependencies = [ - "winapi", -] - -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.61+curl-8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "darling" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "directories" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "epub-builder" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b1b5059c4b990da60cb6fee785e49ea09d1ed8249d91e2dddfd92b74b7cbc" -dependencies = [ - "chrono", - "error-chain", - "html-escape", - "lazy_static", - "mustache", - "regex", - "tempdir", - "uuid", - "zip", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flexi_logger" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e9563bb9600593f0f5d38c24f0e3dc550cd301b4872b986e20f1874104791" -dependencies = [ - "atty", - "chrono", - "glob", - "lazy_static", - "log 0.4.17", - "regex", - "thiserror", - "yansi", -] - -[[package]] -name = "flume" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bebadab126f8120d410b677ed95eee4ba6eb7c6dd8e34a5ec88a08050e26132" -dependencies = [ - "futures-core", - "futures-sink", - "spinning_top", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hkdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log 0.4.17", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.4.0", - "fnv", - "itoa 1.0.6", -] - -[[package]] -name = "http-client" -version = "6.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" -dependencies = [ - "async-std", - "async-trait", - "cfg-if", - "http-types", - "isahc", - "log 0.4.17", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64", - "cookie", - "futures-lite", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "isahc" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" -dependencies = [ - "bytes 0.5.6", - "crossbeam-utils", - "curl", - "curl-sys", - "flume", - "futures-lite", - "http", - "log 0.4.17", - "once_cell", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever", - "matches", - "selectors", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libnghttp2-sys" -version = "0.1.7+1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "value-bag", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log 0.4.17", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log 0.4.17", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "mustache" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5" -dependencies = [ - "log 0.3.9", - "serde", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "paperoni" -version = "0.6.1-alpha1" -dependencies = [ - "async-std", - "base64", - "chrono", - "clap", - "colored", - "comfy-table", - "derive_builder", - "directories", - "epub-builder", - "flexi_logger", - "futures", - "html5ever", - "indicatif", - "itertools", - "kuchiki", - "lazy_static", - "log 0.4.17", - "md5", - "regex", - "surf", - "thiserror", - "url", -] - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue", - "libc", - "log 0.4.17", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polyval" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" -dependencies = [ - "cpuid-bool", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.17", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log 0.4.17", - "matches", - "phf", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel", - "futures-core", - "futures-io", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spinning_top" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "surf" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" -dependencies = [ - "async-std", - "async-trait", - "cfg-if", - "encoding_rs", - "futures-util", - "getrandom 0.2.9", - "http-client", - "http-types", - "log 0.4.17", - "mime_guess", - "once_cell", - "pin-project-lite", - "serde", - "serde_json", - "web-sys", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log 0.4.17", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" -dependencies = [ - "bumpalo", - "log 0.4.17", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" - -[[package]] -name = "web-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "yaml-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "crc32fast", - "thiserror", - "time 0.1.45", -] diff --git a/pkgs/tools/text/paperoni/default.nix b/pkgs/tools/text/paperoni/default.nix deleted file mode 100644 index 5378598da7df..000000000000 --- a/pkgs/tools/text/paperoni/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, curl -, stdenv -, pkg-config -, zlib -, openssl -}: - -rustPlatform.buildRustPackage rec { - pname = "paperoni"; - version = "0.6.1-alpha1"; - - src = fetchFromGitHub { - owner = "hipstermojo"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vTylnDtoPpiRtk/vew1hLq3g8pepWRVqBEBnvSif4Zw="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - curl - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = [ - curl - zlib - ] ++ lib.optionals stdenv.isLinux [ - openssl - ]; - - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Article extractor in Rust"; - mainProgram = "paperoni"; - homepage = "https://github.com/hipstermojo/paperoni"; - changelog = "https://github.com/hipstermojo/paperoni/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3ac307ad53b6..9686ef706336 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1163,6 +1163,7 @@ mapAliases ({ PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = metal-cli; # Added 2021-10-25 + paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03be6c25f504..a05cb95226d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11196,8 +11196,6 @@ with pkgs; paperless-ngx = callPackage ../applications/office/paperless-ngx { }; - paperoni = callPackage ../tools/text/paperoni { }; - paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; papeer = callPackage ../tools/text/papeer { }; From f944854568835643e5462d86125c47d1dfb4152e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 10:11:16 +0200 Subject: [PATCH 107/132] xfce4-embed-plugin: remove --- pkgs/desktops/xfce/default.nix | 4 +- .../xfce4-embed-plugin/default.nix | 49 ------------------- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0de704176ec9..5d0efd28bfe9 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -125,8 +125,6 @@ makeScopeWithSplicing' { xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { }; - xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; - xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; @@ -174,6 +172,8 @@ makeScopeWithSplicing' { thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 + xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15 + xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08 }); diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix deleted file mode 100644 index 6d8e1199b99b..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, intltool -, libxfce4util -, xfce4-panel -, libxfce4ui -, gtk2 -, gitUpdater -}: - -let - category = "panel-plugins"; -in stdenv.mkDerivation rec { - pname = "xfce4-embed-plugin"; - version = "1.6.0"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-x2ffY2DoGUsyvCSCPdAAl17boMr+Ulwj14VAKTWe4ig="; - }; - - nativeBuildInputs = [ - pkg-config - intltool - ]; - - buildInputs = [ - libxfce4util - libxfce4ui - xfce4-panel - gtk2 - ]; - - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; - }; - - meta = with lib;{ - homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; - description = "Embed arbitrary app windows on Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 - maintainers = with maintainers; [ ] ++ teams.xfce.members; - }; -} From ba46a36685afeaa190500efa8249a267989b8681 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 06:25:24 +0000 Subject: [PATCH 108/132] python312Packages.aioairzone: 0.9.1 -> 0.9.3 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index d8032a0e2f00..34bdc5b65dd1 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-snZtM5iDaJjqRSTf4kZVjro2k2h/b6XiT4UUCw1gF1g="; + hash = "sha256-ThmHiZmXbpzTJ0JBm6gVsxZgmdzRqQfjNrJSFbwOIdU="; }; build-system = [ setuptools ]; From 1260d7e30296b3f922107af6d20f1adea5a94829 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 07:21:05 +0000 Subject: [PATCH 109/132] marwaita-orange: 20.3.1 -> 21 --- pkgs/by-name/ma/marwaita-orange/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 2079e209b0db..16de4362c4fd 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-DdtFAUoIT51kGrEz1IpLvuJMEL+pMDICobuNV6UfC6Q="; + hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI="; }; buildInputs = [ From 9023fea2d7da84f4964cf3fd5b209589da90a6f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 09:28:39 +0000 Subject: [PATCH 110/132] yarn-berry: 4.4.1 -> 4.5.0 --- pkgs/development/tools/yarn-berry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 79f3143ef318..0f0e7c7f81ec 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-bkhPdnRImeYBd0yY+iRYXk1KELyCWZusSmVGl2tbM+s="; + hash = "sha256-OTCFUoEgj1kY8QSqaYIqtSoWBYR0i0ao2dNRBhijEzc="; }; buildInputs = [ From 8ebc49b056b1bc48862236bd0725ca1da85d7845 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 19 Sep 2024 05:34:24 -0400 Subject: [PATCH 111/132] google-compute-engine: remove broken boto dependency --- pkgs/tools/virtualization/google-compute-engine/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index c980a45bbef2..a745a2e39d56 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -4,7 +4,6 @@ , bash , bashInteractive , util-linux -, boto , setuptools , distro }: @@ -21,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + propagatedBuildInputs = [ setuptools distro ]; postPatch = '' for file in $(find google_compute_engine -type f); do From 753db0283c291857d09dd6782109544067479d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 12:31:00 +0000 Subject: [PATCH 112/132] audacity: 3.6.3 -> 3.6.4 --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index d8d7a5429fd1..d7f515007d92 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-fjEUo0NY/ZOujtgpWTXHLaMjzAlel3xHY+erzxLi5kQ="; + hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; }; postPatch = '' From 5108a107b244c127ea2d1097a8322ff06aebaab5 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 19 Sep 2024 15:11:45 +0200 Subject: [PATCH 113/132] python3Packages.eigenpy: 3.9.0 -> 3.9.1 Diff: https://github.com/stack-of-tasks/eigenpy/compare/refs/tags/v3.9.0...v3.9.1 Changelog: https://github.com/stack-of-tasks/eigenpy/releases/tag/v3.9.1 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 41066ba788a6..e45b5424a4b0 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.9.0"; + version = "3.9.1"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-fJLX3ZhcgevXcXkR00fzDh9LtfMwaHsJWQgUexmuKLc="; + hash = "sha256-nRslQMnVaVN7S20RuJDp+e9p+oMhsR03EjHYpvkuBYk="; }; outputs = [ From 410554efd51567b54167e7c368f9a348cc70a7ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 14:54:48 +0000 Subject: [PATCH 114/132] unityhub: 3.8.0 -> 3.9.1 --- pkgs/development/tools/unityhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 84fe6d435936..893f476df63e 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-TjuOsF4LFqQGx4j5j/Er97MNhVm72qlvGYZvA5vuXs8="; + sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA="; }; nativeBuildInputs = [ From 06967a84064cb81e5a4f05c1a32f5d1b2f4870fb Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:02:11 +0200 Subject: [PATCH 115/132] nushell: remove update script Just use the provided update scripts. This is not needed --- pkgs/shells/nushell/update.sh | 70 ----------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 pkgs/shells/nushell/update.sh diff --git a/pkgs/shells/nushell/update.sh b/pkgs/shells/nushell/update.sh deleted file mode 100644 index 9a8015e74600..000000000000 --- a/pkgs/shells/nushell/update.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -#!nix-shell -p git nix-update nixpkgs-review nixfmt-rfc-style - -set -euxo pipefail - -basedir="$(git rev-parse --show-toplevel)" -cd "$basedir" - -branch="update-nushell" -nuPath="pkgs/shells/nushell" - -function staged() { - if git status --porcelain | grep -q -E "^[AM].? +$1"; then - return 0 - else - return 1 - fi -} - -function version() { - grep '\s*version = ' "$nuPath/default.nix" | cut -d'"' -f 2 | head --lines 1 -} - -git checkout -B "$branch" - -version_old=$(version) -if ! staged "$nuPath/default.nix"; then - nix-update nushell - git add "$nuPath/default.nix" -fi -version_new=$(version) - -declare -a plugins=(formats query polars gstat) -for plugin in "${plugins[@]}"; do - attr="nushellPlugins.$plugin" - pluginPath="$nuPath/plugins/$plugin.nix" - - if staged "$pluginPath"; then - echo "Skipping '$plugin' because it's alredy staged" - continue - fi - - echo "Attempting to build $attr" - - set +e - newHash=$(nix build ".#$attr" 2> \ - >(grep got | - awk -F' ' '{ print $2 }')) - set -e - - # New hash ? - if [ -n "$newHash" ]; then - # Add the new hash - sed -i "s!cargoHash = ".*";!cargoHash = \"$newHash\";!" "$pluginPath" - nixfmt "$pluginPath" - - echo "Building $plugin again with new hash $newHash" - nix build ".#$attr" - git add "$pluginPath" - echo "Plugin $plugin built sucessfully" - else - echo "No new hash for '$plugin'" - fi -done - -git commit -m "nushell: $version_old -> $version_new" - -echo "Starting nixpkgs-review" -nixpkgs-review rev "$branch" From dbd569f69a1728497810f3cb46bb766cf333db32 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 9 Sep 2024 16:02:54 +0800 Subject: [PATCH 116/132] switchres: init at 2.2.1 --- pkgs/by-name/sw/switchres/package.nix | 63 +++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/sw/switchres/package.nix diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix new file mode 100644 index 000000000000..1c1818bc51c5 --- /dev/null +++ b/pkgs/by-name/sw/switchres/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + pkg-config, + fetchFromGitHub, + xorg, + libdrm, + SDL2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "switchres"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "antonioginer"; + repo = "switchres"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-/21RcpumWYNBPck7gpH6krwC3Thz/rKDPgeJblN2BDA="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + xorg.libXrandr + xorg.xorgproto + libdrm + SDL2 + ]; + + patchPhase = '' + runHook preHook + + substituteInPlace ./custom_video_xrandr.cpp \ + --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so \ + --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so + + substituteInPlace ./custom_video_drmkms.cpp \ + --replace-fail libdrm.so ${libdrm}/lib/libdrm.so \ + + runHook postHook + ''; + + env = { + PREFIX = "$(out)"; + }; + + preInstall = '' + install -Dm755 switchres $out/bin/switchres + ''; + + meta = { + description = "Modeline generation engine for emulation"; + homepage = "https://github.com/antonioginer/switchres"; + changelog = "https://github.com/antonioginer/switchres/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + mainProgram = "switchres"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.linux; + }; +}) From 9114eee2a237a069f129032811a8faa352747ac7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 15:40:57 +0000 Subject: [PATCH 117/132] python312Packages.greatfet: 2024.0.1 -> 2024.0.2 --- pkgs/development/python-modules/greatfet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 9383ec903700..2ed9792df3b2 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.1"; + version = "2024.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; + hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; }; sourceRoot = "${src.name}/host"; From caf94139059c92f6433f740b62b50a243369d78e Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 19 Sep 2024 00:14:59 +0000 Subject: [PATCH 118/132] xen: remove XSA_458 patch None of our Xen branches need it anymore. Signed-off-by: Fernando Rodrigues --- .../virtualization/xen/generic/patches.nix | 15 --------------- pkgs/applications/virtualization/xen/update.sh | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkgs/applications/virtualization/xen/generic/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix index 33b4cdf8035e..35abfdd86a91 100644 --- a/pkgs/applications/virtualization/xen/generic/patches.nix +++ b/pkgs/applications/virtualization/xen/generic/patches.nix @@ -99,21 +99,6 @@ in }) ]; - # Xen Security Advisory #458: (4.16.6 - 4.19-rc3) - "XSA_458" = xsaPatch { - id = "458"; - title = "Double unlock in x86 guest IRQ handling"; - description = '' - An optional feature of PCI MSI called "Multiple Message" allows a device - to use multiple consecutive interrupt vectors. Unlike for MSI-X, the - setting up of these consecutive vectors needs to happen all in one go. - In this handling an error path could be taken in different situations, - with or without a particular lock held. This error path wrongly releases - the lock even when it is not currently held. - ''; - cve = [ "CVE-2024-31143" ]; - hash = "sha256-yHI9Sp/7Ed40iIYQ/HOOIULlfzAzL0c0MGqdF+GR+AQ="; - }; # Xen Security Advisory #460: (4.16.6 - 4.19.0) "XSA_460" = xsaPatch { id = "460"; diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh index a7318aef0324..185fee74774c 100755 --- a/pkgs/applications/virtualization/xen/update.sh +++ b/pkgs/applications/virtualization/xen/update.sh @@ -120,7 +120,7 @@ for version in "${supportedVersions[@]}"; do echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m" # Prepare patches that are called in ./patches.nix. - defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" ) + defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_460" "XSA_461" ) read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: ' defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}}) upstreamPatches=${defaultPatchList[*]} From 97e4f5304493b18545e9306114fbc53db4860fdb Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 19 Sep 2024 00:18:16 +0000 Subject: [PATCH 119/132] xen: minor updates to the update script - Drop `-ie` flags for grep; - Add more `doing things...done` echo stanzas so it's clearer when a part of the script has concluded; - Add a note explaining why QEMU and OVMF take so long to fetch; - Add a TODO for future work at the top of the file. Signed-off-by: Fernando Rodrigues --- .../applications/virtualization/xen/update.sh | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh index 185fee74774c..e5012768b4e8 100755 --- a/pkgs/applications/virtualization/xen/update.sh +++ b/pkgs/applications/virtualization/xen/update.sh @@ -5,6 +5,9 @@ set -o errexit set -o pipefail set -o nounset +#TODO: Use `jq` instead of `sed`. +#TODO: Accept the small security drawback and make this script runnable by r-ryantm. + # This script expects to be called in an interactive terminal somewhere inside Nixpkgs. echo "Preparing..." nixpkgs=$(git rev-parse --show-toplevel) @@ -35,6 +38,8 @@ minSupportedBranch="$(grep " minSupportedVersion = " "$xenPath"/generic/default supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done)) supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done)) +echo -e "\e[1mNOTE\e[0m: As we're also pre-fetching the submodules, QEMU and OVMF may take a very long time to fetch." + # Main loop that installs every supportedVersion. for version in "${supportedVersions[@]}"; do echo -e "\n------------------------------------------------" @@ -59,11 +64,13 @@ for version in "${supportedVersions[@]}"; do git switch --quiet --detach RELEASE-"$version" # Originally we told people to go check the Makefile themselves. - echo -e "\nDetermining source versions from Xen Makefiles..." - qemuVersion="$(grep -ie "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" - seaBIOSVersion="$(grep -ie "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" - ovmfVersion="$(grep -ie "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" - ipxeVersion="$(grep -ie "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo -e -n "\nDetermining source versions from Xen Makefiles..." + qemuVersion="$(grep "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" + seaBIOSVersion="$(grep "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" + ovmfVersion="$(grep "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" + miniOSVersion="$(grep "MINIOS_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"MINIOS_UPSTREAM_REVISION ?= "//g)" + ipxeVersion="$(grep "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo "done!" # Use `nix-prefetch-git` to fetch `rev`s and `hash`es. echo "Pre-fetching sources and determining hashes..." @@ -126,7 +133,7 @@ for version in "${supportedVersions[@]}"; do upstreamPatches=${defaultPatchList[*]} # Write and format default.nix file. - echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..." + echo -e -n "\nWriting updated \e[1;34mversionDefinition\e[0m..." cat >"$branch"/default.nix < Date: Thu, 19 Sep 2024 16:05:47 +0000 Subject: [PATCH 120/132] xen: don't patch QEMU and OVMF if they aren't being built This resolves the spurious 'directory not found' errors in the xen-slim builds. Signed-off-by: Fernando Rodrigues --- pkgs/applications/virtualization/xen/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix index c81a13daa99a..f7bbde81663f 100644 --- a/pkgs/applications/virtualization/xen/generic/default.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -532,8 +532,10 @@ stdenv.mkDerivation (finalAttrs: { ${deployPrefetchedSourcesPatches} '' # Patch shebangs for QEMU and OVMF build scripts. - + '' + + lib.strings.optionalString withInternalQEMU '' patchShebangs --build tools/qemu-xen/scripts/tracetool.py + '' + + lib.strings.optionalString withInternalOVMF '' patchShebangs --build tools/firmware/ovmf-dir-remote/OvmfPkg/build.sh tools/firmware/ovmf-dir-remote/BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} ''; From cd6ed2642c338bd65165be2b8c53c35ea3162e17 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Sep 2024 19:15:25 +0300 Subject: [PATCH 121/132] rustc: Correct `enable-profiler` `linux` check remove the `isRedox` condition which was added because `stdenv.isLinux` uses `hostPlatform`, after specifying `targetPlatform` it's no longer necessary. --- pkgs/development/compilers/rust/rustc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 509f255fda78..1b8a3dbfba6b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -156,7 +156,7 @@ in stdenv.mkDerivation (finalAttrs: { # Since fastCross only builds std, it doesn't make sense (and # doesn't work) to build a linker. "--disable-llvm-bitcode-linker" - ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox && !(stdenv.targetPlatform.useLLVM or false)) [ + ] ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [ "--enable-profiler" # build libprofiler_builtins ] ++ optionals stdenv.buildPlatform.isMusl [ "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" From 3354a815f6cf07dc98ed6de0641f60f84e760967 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 16:58:53 +0000 Subject: [PATCH 122/132] python312Packages.kombu: 5.4.1 -> 5.4.2 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index bfd5beb329bf..696860862b11 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HAUXiCbauBH4yrWwoVTUKnoz2Lzd6fo9e0WC5Dw8A9s="; + hash = "sha256-7vVy3S/Z/GFLN1gOPK6v3Vr0bB7/Mef7qJE4zbQG8s8="; }; propagatedBuildInputs = From 72f230e1c303884b7fcc13b812f81bd09cba4346 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 19 Sep 2024 13:00:14 -0400 Subject: [PATCH 123/132] zed-editor: 0.152.4 -> 0.153.6 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 52 +++++++++++++------------- pkgs/by-name/ze/zed-editor/package.nix | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 4a6bdbddb433..f36c55620812 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -243,7 +243,6 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "collections", "futures 0.3.30", "http_client", "isahc", @@ -833,9 +832,9 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.38.1" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ddaa6999d246ba2c6c84d830a1ba0cd16c9234d58701988b3869f0e5bd732d" +checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30" dependencies = [ "chrono", "futures-util", @@ -3285,7 +3284,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -4929,6 +4928,7 @@ dependencies = [ "anyhow", "futures 0.3.30", "http_client", + "isahc", "schemars", "serde", "serde_json", @@ -6138,7 +6138,7 @@ dependencies = [ "lsp", "parking_lot", "postage", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "rand 0.8.5", "regex", "rpc", @@ -6658,7 +6658,7 @@ dependencies = [ "linkify", "log", "node_runtime", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "settings", "theme", "ui", @@ -6678,7 +6678,8 @@ dependencies = [ "linkify", "log", "pretty_assertions", - "pulldown-cmark", + "pulldown-cmark 0.12.1", + "settings", "theme", "ui", "workspace", @@ -6773,7 +6774,7 @@ dependencies = [ "once_cell", "opener", "pathdiff", - "pulldown-cmark", + "pulldown-cmark 0.10.3", "regex", "serde", "serde_json", @@ -7067,18 +7068,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -8605,6 +8594,17 @@ dependencies = [ "unicase", ] +[[package]] +name = "pulldown-cmark" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "unicase", +] + [[package]] name = "pulldown-cmark-escape" version = "0.10.1" @@ -9183,7 +9183,7 @@ dependencies = [ "gpui", "language", "linkify", - "pulldown-cmark", + "pulldown-cmark 0.12.1", "theme", "ui", "util", @@ -14155,7 +14155,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.29.0", + "nix", "ordered-stream", "rand 0.8.5", "serde", @@ -14197,7 +14197,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.152.4" +version = "0.153.6" dependencies = [ "activity_indicator", "anyhow", @@ -14253,7 +14253,7 @@ dependencies = [ "markdown_preview", "menu", "mimalloc", - "nix 0.28.0", + "nix", "node_runtime", "notifications", "outline", @@ -14484,14 +14484,14 @@ dependencies = [ [[package]] name = "zed_svelte" -version = "0.0.3" +version = "0.1.1" dependencies = [ "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "zed_terraform" -version = "0.0.4" +version = "0.1.0" dependencies = [ "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d9e240d6c1a9..cdc08c9ce90c 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -85,13 +85,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.152.4"; + version = "0.153.6"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-nmnhJQ8DDKuy0DBfQCEj9FsVXre/gTkIsr5UjiiWasU="; + hash = "sha256-8yu1xAN8GQXWXF4PHRbOx4oWK3EYc4POQlOYaDiPH+A="; fetchSubmodules = true; }; From d2e6b8dac628c1a757c5b341ca2d9c4d2d49163d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 19 Sep 2024 20:47:18 +0300 Subject: [PATCH 124/132] nixos/tests/wpa_supplicant: explicitly set channel mac80211_hwsim can't emulate ACS, so explicitly choose a channel. --- nixos/tests/wpa_supplicant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 808e39b03644..7ca70864b837 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -21,6 +21,7 @@ let enable = true; radios.wlan0 = { band = "2g"; + channel = 6; countryCode = "US"; networks = { wlan0 = { From 818d2a60a820bd155107950b0e5b79e65cd1f456 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Thu, 19 Sep 2024 11:01:19 -0700 Subject: [PATCH 125/132] hedgedoc: correct typo in deprecation notice Continues #244941 --- nixos/modules/services/web-apps/hedgedoc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 919d870b3a2c..36d79a4153ec 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -26,7 +26,7 @@ in (lib.mkRemovedOptionModule [ "services" "hedgedoc" "workDir" ] '' This option has been removed in favor of systemd managing the state directory. - If you have set this option without specifying `services.settings.uploadsDir`, + If you have set this option without specifying `services.hedgedoc.settings.uploadsPath`, please move these files to `/var/lib/hedgedoc/uploads`, or set the option to point at the correct location. '') From b146aff9d239607de7560ec7ca8579d73edb2918 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Fri, 20 Sep 2024 02:11:34 +0800 Subject: [PATCH 126/132] linuxPackages_latest.prl-tools: add update script --- maintainers/maintainer-list.nix | 6 +++ pkgs/os-specific/linux/prl-tools/default.nix | 4 +- pkgs/os-specific/linux/prl-tools/update.sh | 39 ++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/prl-tools/update.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b042e0376a22..4f324bde1f25 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4050,6 +4050,12 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codgician = { + email = "codgician@outlook.com"; + github = "codgician"; + githubId = 15964984; + name = "codgician"; + }; codifryed = { email = "gb@guyboldon.com"; name = "Guy Boldon"; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index bb8a81d46056..7c36fefe09a5 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -169,11 +169,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; license = licenses.unfree; - maintainers = with maintainers; [ catap wegank ]; + maintainers = with maintainers; [ catap wegank codgician ]; platforms = platforms.linux; }; }) diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/os-specific/linux/prl-tools/update.sh new file mode 100644 index 000000000000..58b7c14c47fb --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -eu -o pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix" + +# Currently this script only supports Parallels 20 +# Please change the knowledge base url after each major release +kb_url="https://kb.parallels.com/en/130212" +content="$(curl -s "$kb_url")" + +# Match latest version from Parallels knowledge base +regex='' +if [[ $content =~ $regex ]]; then + major_version="${BASH_REMATCH[1]}" + version="${BASH_REMATCH[2]}-${BASH_REMATCH[3]}" + echo "Found latest version: $version, major version: $major_version" +else + echo "Failed to extract version from $kb_url" + exit 1 +fi + +# Extract and compare current version +old_version="$(grep -o 'version = ".*"' "$path" | awk -F'"' '{print $2}')" +if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then + echo "Current version $old_version is up-to-date" + exit 0 +fi + +# Update version and hash +dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg" +sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')" +sed -i -e "s/version = \"$old_version\"/version = \"$version\"/" \ + -e "s/hash = \"sha256-.*\"/hash = \"$sha256\"/" "$path" + +git commit -qm "linuxPackages_latest.prl-tools: $old_version -> $version" "$path" +echo "Updated linuxPackages_latest.prl-tools $old_version -> $version" From 59070b8044d202849b42d4af1632feaded2f58ef Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Fri, 20 Sep 2024 02:12:04 +0800 Subject: [PATCH 127/132] linuxPackages_latest.prl-tools: 20.0.0-55653 -> 20.0.1-55659 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 7c36fefe09a5..4474b07229c2 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.0.0-55653"; + version = "20.0.1-55659"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-ohGhaLVzXuR/mQ6ToeGbTixKy01F14JSgTs128vGZXM="; + hash = "sha256-5h8WZB7L6D9KOgIPSstN1sNcf3FZQiOQFB5MUC4YzvA="; }; hardeningDisable = [ "pic" "format" ]; From 1061e2e141078556edee8e97d74ff65bf744efab Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Thu, 19 Sep 2024 20:32:45 +0200 Subject: [PATCH 128/132] nushell: 0.97.1 -> 0.98.0 changelog: https://www.nushell.sh/blog/2024-09-17-nushell_0_98_0.html --- pkgs/shells/nushell/default.nix | 6 +++--- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/polars.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a391ac6999eb..b763526dda60 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.97.1"; + version = "0.98.0"; in rustPlatform.buildRustPackage { @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-hrcPWJ5OXFozfNux6iR/nEw/1z64N5BV4DD/JWhlH2U="; + hash = "sha256-0XN26onR4Tk8Ejc/UntdL+b5FPBOoBmDQM0DRommIMo="; }; - cargoHash = "sha256-iGmAgrj1oy0t8SsSuCNiUoqWXDFA2CdsPnYYYOpXofs="; + cargoHash = "sha256-43V0TnYGG2tyWRIGaohIaoN7dxnY1fle2Bp5lDiFlWg="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index f713957f27d2..a74721ad9031 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-pWtQYraMJ8nXJiTQPXxu/kEg4ftQy8YAjhUj9WPEYS8="; + cargoHash = "sha256-Lcgf6+Li1STl4Sko81oBHAnX09A6F7dwYmHJiF2CZ3s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index c2b12073b727..e430820247dc 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-f7gH5Kxz8vsYQluvIl/VNklFh80kFKCZEyJvH5eD9Qk="; + cargoHash = "sha256-NLGEaIGUqgyGegzVyZloLckVGYmfMjwhzVXh327kxRA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index 88c29e0ccbda..7e9e1623bea6 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-agUuDPv8LJixj3cBrvhW8UdPLQHNVYpSlPGvioxZoDU="; + cargoHash = "sha256-LfD0b9ZDWA1apKR36eHx1gKFiKSGAr2tqbZKTc2rMIE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index c3440a7295de..85520b32e0e3 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-ygzHnrQ3zO1+lxzRUFO1+0XocGBemJKoDa4oiCjCe+0="; + cargoHash = "sha256-7E4CCs4xyNGwjk6B2CwIFf1x0o5uNQArZpyxXEKLXMI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = From 5bba5c297abf289d0d2131f8e0d5a1380df0d4c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 18:54:39 +0000 Subject: [PATCH 129/132] python312Packages.qdrant-client: 1.11.1 -> 1.11.2 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 4410fcd51bda..d54ac47473a5 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.11.1"; + version = "1.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-NIGmQMtGvm6zifYJIMFx+d9w9IZmQUAqieBo/3JmYbM="; + hash = "sha256-DVyaBQ8r52H9q2NNDsplfPxoxwZeK3pHNfnyw9a9hvw="; }; build-system = [ poetry-core ]; From 55e6535e4e190e53f7875f0cf84d44c93564c67e Mon Sep 17 00:00:00 2001 From: Niko Cantero <97130632+nyabinary@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:04:36 -0400 Subject: [PATCH 130/132] maintainers: rename nyanbinary to nyabinary --- maintainers/maintainer-list.nix | 14 +++++++------- pkgs/by-name/co/cosmic-applets/package.nix | 2 +- pkgs/by-name/co/cosmic-applibrary/package.nix | 2 +- pkgs/by-name/co/cosmic-bg/package.nix | 2 +- pkgs/by-name/co/cosmic-comp/package.nix | 2 +- pkgs/by-name/co/cosmic-design-demo/package.nix | 2 +- pkgs/by-name/co/cosmic-edit/package.nix | 2 +- pkgs/by-name/co/cosmic-files/package.nix | 2 +- pkgs/by-name/co/cosmic-greeter/package.nix | 2 +- pkgs/by-name/co/cosmic-launcher/package.nix | 2 +- pkgs/by-name/co/cosmic-notifications/package.nix | 2 +- pkgs/by-name/co/cosmic-osd/package.nix | 2 +- pkgs/by-name/co/cosmic-panel/package.nix | 2 +- pkgs/by-name/co/cosmic-protocols/package.nix | 2 +- pkgs/by-name/co/cosmic-randr/package.nix | 2 +- pkgs/by-name/co/cosmic-screenshot/package.nix | 2 +- pkgs/by-name/co/cosmic-session/package.nix | 2 +- pkgs/by-name/co/cosmic-settings-daemon/package.nix | 2 +- pkgs/by-name/co/cosmic-settings/package.nix | 2 +- pkgs/by-name/co/cosmic-store/package.nix | 2 +- pkgs/by-name/co/cosmic-term/package.nix | 2 +- .../by-name/co/cosmic-workspaces-epoch/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/he/headphones-toolbox/package.nix | 2 +- .../xd/xdg-desktop-portal-cosmic/package.nix | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b042e0376a22..ec2727b9662a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15310,6 +15310,13 @@ githubId = 5047052; name = "Niclas Hirschfeld"; }; + nyabinary = { + name = "Niko Cantero"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; + github = "nyabinary"; + githubId = 97130632; + }; nyadiia = { email = "nyadiia@pm.me"; github = "nyadiia"; @@ -15317,13 +15324,6 @@ name = "Nadia"; keys = [ { fingerprint = "6B51 E324 238A F455 2381 313A 9254 1B0C D2A9 3AD8"; } ]; }; - nyanbinary = { - email = "nyanbinary@keemail.me"; - matrix = "@niko:conduit.rs"; - github = "nyabinary"; - githubId = 97130632; - name = "Niko"; - }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 809010c31e8c..c3bc5db415e7 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applets"; description = "Applets for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 6402cd1d30bc..c7f26c5fde3e 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-applibrary"; description = "Application Template for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-app-library"; }; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index f0a81198f680..12ce7083c3c4 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-bg"; description = "Applies Background for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-bg"; }; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 5bd04bf2db4a..544c214894a3 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -94,7 +94,7 @@ rustPlatform.buildRustPackage rec { description = "Compositor for the COSMIC Desktop Environment"; mainProgram = "cosmic-comp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 3de84af59979..24dee441572c 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-design-demo"; }; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 2c8cd21562de..40d6eb082dd4 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -105,7 +105,7 @@ rustPlatform.buildRustPackage rec { description = "Text Editor for the COSMIC Desktop Environment"; mainProgram = "cosmic-edit"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 32994724519a..31f238b10d64 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-files"; description = "File Manager for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index ecc9dea6ab70..2a9473800b3c 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { description = "Greeter for the COSMIC Desktop Environment"; mainProgram = "cosmic-greeter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index fe11ba04509c..5ff34d7528e1 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Launcher for the COSMIC Desktop Environment"; mainProgram = "cosmic-launcher"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index bae1f66e20ac..3b76952a5cf4 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { description = "Notifications for the COSMIC Desktop Environment"; mainProgram = "cosmic-notifications"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 80c64e40635d..2b3d70691342 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 46404ed6fde7..960d8d7314e8 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss nyanbinary ]; + maintainers = with maintainers; [ qyliss nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 1805d4b48fed..f4ba351d5c45 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; license = [ licenses.mit licenses.gpl3Only ]; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 0c3b5b752d16..da7e3ca6ffee 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-randr"; description = "Library and utility for displaying and configuring Wayland outputs"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-randr"; }; diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 1881ef8fb9db..50f484a3ab2d 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-screenshot"; description = "Screenshot tool for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-screenshot"; }; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index e7f2e9a474ef..19bdc5ab0f92 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "cosmic-session"; maintainers = with maintainers; [ a-kenji - nyanbinary + nyabinary ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 8b0c9819ab4e..6db310e48919 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 669b5403a0e1..5ab555f262e4 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-settings"; }; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index c2859ba558de..5954f3a7e635 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-store"; description = "App Store for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 699c8a8564e3..02911fca4a89 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-term"; description = "Terminal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ahoneybun nyanbinary ]; + maintainers = with maintainers; [ ahoneybun nyabinary ]; platforms = platforms.linux; mainProgram = "cosmic-term"; }; diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index b0fd28563c40..beadf7385684 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { description = "Workspaces Epoch for the COSMIC Desktop Environment"; mainProgram = "cosmic-workspaces"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 14fe785c499a..0d9027fbd07b 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Milkshiift/GoofCord"; downloadPage = "https://github.com/Milkshiift/GoofCord"; license = lib.licenses.osl3; - maintainers = with lib.maintainers; [ nyanbinary ]; + maintainers = with lib.maintainers; [ nyabinary ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index 4b03fb273111..2b71ad126eff 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "UI for configuring Ploopy Headphones"; homepage = "https://github.com/ploopyco/headphones-toolbox/"; - maintainers = with maintainers; [ knarkzel nyanbinary ]; + maintainers = with maintainers; [ knarkzel nyabinary ]; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index f299e46b8d96..717facbc033c 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic"; description = "XDG Desktop Portal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nyanbinary ]; + maintainers = with maintainers; [ nyabinary ]; mainProgram = "xdg-desktop-portal-cosmic"; platforms = platforms.linux; }; From 93228d26c6ed501d7ea56a216bec9a01f1f6bbf9 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 19 Sep 2024 21:40:29 +0200 Subject: [PATCH 131/132] Docs: highlight structure vision (#342978) Co-authored-by: Valentin Gagarin --- doc/README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/README.md b/doc/README.md index 211f986b851d..534fc92de5a8 100644 --- a/doc/README.md +++ b/doc/README.md @@ -2,10 +2,20 @@ This directory houses the sources files for the Nixpkgs reference manual. -Going forward, it should only contain [reference](https://nix.dev/contributing/documentation/diataxis#reference) documentation. -For tutorials, guides and explanations, contribute to instead. +> [!IMPORTANT] +> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/) +> +> Going forward, this directory should **only** contain [reference documentation](https://nix.dev/contributing/documentation/diataxis#reference). +> For tutorials, guides and explanations, contribute to instead. +> +> We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code. +> This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly. -For documentation only relevant for contributors, use Markdown files and code comments in the source code. +For documentation only relevant for contributors, use Markdown files next to the source and regular code comments. + +> [!TIP] +> Feedback for improving support for parsing and rendering doc-comments is highly appreciated. +> [Open an issue](https://github.com/NixOS/nixpkgs/issues/new?labels=6.topic%3A+documentation&title=Doc%3A+) to request bugfixes or new features. Rendered documentation: - [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/) From fa83a9373af900b8146651aeaf75aa3a6236a9f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 13:06:41 +0000 Subject: [PATCH 132/132] htgettoken: 2.0 -> 2.0-2 --- pkgs/by-name/ht/htgettoken/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index 30d34adeb231..6fa7bc4baaac 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.0"; + version = "2.0-2"; src = fetchFromGitHub { owner = "fermitools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yHUD8UaRNclALKKToFNzC49w5jivabXBt28xi6/u0Ow="; + hash = "sha256-1rF72zo/Jj4ZeEG2Nk6Wla+AfaDo5iPZhZP1j9WAK5I="; }; nativeBuildInputs = with python3.pkgs; [