From 43449be7e7daaa6c448c0b5a386ea89e73f84cf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 15:31:51 +0000 Subject: [PATCH 01/88] memtier-benchmark: 1.4.0 -> 2.0.0 --- pkgs/tools/networking/memtier-benchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index 5d1fd792b7b..f4ecbb98631 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "sha256-1ZgSmHOLvPecqVN9P/Mr/2cOdbdl4oe4GgMjLaDX7YQ="; + sha256 = "sha256-3KFBj+Cj5qO5k1hy5oSvtXdtTZIbGPJ1fhmnIeCW2s8="; }; patchPhase = '' From 0ee36e16a3d757c65bc5d113cb79c4f8c185d384 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 9 Jun 2023 22:04:37 +0100 Subject: [PATCH 02/88] clap: init at 1.1.8 --- pkgs/development/libraries/clap/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/clap/default.nix diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix new file mode 100644 index 00000000000..832ca66d6d7 --- /dev/null +++ b/pkgs/development/libraries/clap/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "clap"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "free-audio"; + repo = "clap"; + rev = version; + hash = "sha256-UY6HSth3xuXVfiKolttpYf19rZ2c/X1FXHV7TA/hAiM="; + }; + + postPatch = '' + substituteInPlace clap.pc.in \ + --replace '$'"{prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' + ''; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Clever Audio Plugin API interface headers"; + homepage = "https://cleveraudio.org/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7b067f71fe..b2cc14b3f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20522,6 +20522,8 @@ with pkgs; clanlib = callPackage ../development/libraries/clanlib { }; + clap = callPackage ../development/libraries/clap { }; + classads = callPackage ../development/libraries/classads { }; clfft = callPackage ../development/libraries/clfft { }; From cc5cd006dba90094845e454a9c0c5b9e91b1a361 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 1 Aug 2023 15:05:59 +0300 Subject: [PATCH 03/88] qzdl: init at unstable-2023-04-04 --- pkgs/games/qzdl/default.nix | 65 ++++++++++++++++++++++++++ pkgs/games/qzdl/non-bundled-inih.patch | 36 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 103 insertions(+) create mode 100644 pkgs/games/qzdl/default.nix create mode 100644 pkgs/games/qzdl/non-bundled-inih.patch diff --git a/pkgs/games/qzdl/default.nix b/pkgs/games/qzdl/default.nix new file mode 100644 index 00000000000..0b44328fb8e --- /dev/null +++ b/pkgs/games/qzdl/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, inih +, ninja +, pkg-config +, qtbase +, wrapQtAppsHook +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "qzdl"; + version = "unstable-2023-04-04"; + + src = fetchFromGitHub { + owner = "qbasicer"; + repo = "qzdl"; + rev = "44aaec0182e781a3cef373e5c795c9dbd9cd61bb"; + hash = "sha256-K/mJQb7uO2H94krWJIJtFRYd6BAe2TX1xBt6fGBb1tA="; + }; + + patches = [ + ./non-bundled-inih.patch + ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ninja + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + inih + qtbase + ]; + + postInstall = '' + install -Dm644 $src/res/zdl3.svg $out/share/icons/hicolor/scalable/apps/zdl3.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "zdl3"; + exec = "zdl %U"; + icon = "zdl3"; + desktopName = "ZDL"; + genericName = "A ZDoom WAD Launcher"; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + description = "A ZDoom WAD Launcher"; + homepage = "https://zdl.vectec.net"; + license = licenses.gpl3Only; + inherit (qtbase.meta) platforms; + maintainers = with maintainers; [ azahi ]; + mainProgram = "zdl"; + }; +} diff --git a/pkgs/games/qzdl/non-bundled-inih.patch b/pkgs/games/qzdl/non-bundled-inih.patch new file mode 100644 index 00000000000..7e47dd8c201 --- /dev/null +++ b/pkgs/games/qzdl/non-bundled-inih.patch @@ -0,0 +1,36 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 10a8fb6..dcab540 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -6,16 +6,8 @@ set(CMAKE_AUTOMOC ON) + project(qzdl LANGUAGES C CXX) + find_package(Qt5 COMPONENTS Core Widgets REQUIRED) + +-include(FetchContent) +-FetchContent_Declare( +- inih +- GIT_REPOSITORY https://github.com/benhoyt/inih.git +- GIT_TAG r44 +-) +-FetchContent_GetProperties(inih) +-if (NOT inih_POPULATED) +- FetchContent_Populate(inih) +-endif() ++find_package(PkgConfig) ++pkg_check_modules(INIH inih) + + add_executable( + zdl +@@ -45,9 +37,8 @@ add_executable( + libwad.cpp + qzdl.cpp + ${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp +- ${inih_SOURCE_DIR}/ini.c + ) + +-target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf) +-target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR}) +-target_link_libraries(zdl Qt5::Core Qt5::Widgets) ++target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${INIH_INCLUDEDIR}) ++target_link_libraries(zdl Qt5::Core Qt5::Widgets ${INIH_LDFLAGS}) ++install(TARGETS zdl RUNTIME DESTINATION "bin") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b60528b1fb0..078511c8304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40449,6 +40449,8 @@ with pkgs; qperf = callPackage ../os-specific/linux/qperf { }; + qzdl = libsForQt5.callPackage ../games/qzdl { }; + rates = callPackage ../tools/misc/rates { inherit (darwin.apple_sdk.frameworks) Security; }; From 2f9afe24c35142ffd108881f8f86445fe3d0aa56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Aug 2023 01:43:33 +0000 Subject: [PATCH 04/88] fast-downward: 22.12.0 -> 23.06.0 --- pkgs/applications/science/logic/fast-downward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index 98db5682e7e..a73d141f45b 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "22.12.0"; + version = "23.06.0"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-GwZ5BGzLRMgWNBaA7M2D2p9OxvdyWqm+sTwxGpcI/qY="; + sha256 = "sha256-yNaMyS47yxc/p5Rs/kHwD/pgjGXnHBdybYdo1GIEmA4="; }; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; From cdb4ece558444c5c50a6c9fad9ea5b5e50102da4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 13 Jun 2022 01:38:57 +0200 Subject: [PATCH 05/88] grantlee: 0.5.1 -> 5.2.0 qt4 -> qt5 (cherry picked from commit 93894a8ec961d6ee31c6d7b5cac24541341e16b2) Signed-off-by: Matthias Beyer --- .../libraries/grantlee/default.nix | 36 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 3301d6c47cf..30e7e3556da 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,34 +1,28 @@ -{ lib, stdenv, fetchurl, qt4, cmake }: +{ stdenv, lib, fetchFromGitHub, qtbase, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "grantlee"; - version = "0.5.1"; + version = "5.2.0"; -# Upstream download server has country code firewall, so I made a mirror. - src = fetchurl { - urls = [ - "http://downloads.grantlee.org/grantlee-${version}.tar.gz" - "http://www.loegria.net/grantlee/grantlee-${version}.tar.gz" - ]; - sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; + src = fetchFromGitHub { + owner = "steveire"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ qtbase ]; meta = { - description = "Qt4 port of Django template system"; + description = "Libraries for text templating with Qt"; longDescription = '' - Grantlee is a plugin based String Template system written using the Qt - framework. The goals of the project are to make it easier for application - developers to separate the structure of documents from the data they - contain, opening the door for theming. - - The syntax is intended to follow the syntax of the Django template system, - and the design of Django is reused in Grantlee.''; + Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument. + The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code. + The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee. + ''; homepage = "https://github.com/steveire/grantlee"; - license = lib.licenses.lgpl21; - inherit (qt4.meta) platforms; + license = lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768bf1dc0f0..6e0697c250e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21595,7 +21595,7 @@ with pkgs; granted = callPackage ../tools/admin/granted { }; - grantlee = callPackage ../development/libraries/grantlee { }; + grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; gsasl = callPackage ../development/libraries/gsasl { }; From 886dd61777bd8ad1b6726b748902f87e90cfbfd4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 03:53:43 +0200 Subject: [PATCH 06/88] wt: qt4 -> qt5 (cherry picked from commit c1991546d17a09a5312b3e76b3ad56d7b736fe8f) Signed-off-by: Matthias Beyer --- pkgs/development/libraries/wt/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index c9adf68115b..20cedde5bf1 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu +{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qtbase, libharu , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl , pcre, harfbuzz, icu }: @@ -19,11 +19,12 @@ let nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost doxygen qt48Full libharu + boost doxygen qtbase libharu pango fcgi firebird libmysqlclient postgresql graphicsmagick glew openssl pcre harfbuzz icu ]; + dontWrapQtApps = true; cmakeFlags = [ "-DWT_CPP_11_MODE=-std=c++11" "--no-warn-unused-cli" @@ -44,11 +45,6 @@ let }; }; in { - wt3 = generic { - version = "3.7.1"; - sha256 = "19gf5lbrc5shpvcdyzjh20k8zdj4cybxqvkhwqfl9rvhw89qr11k"; - }; - wt4 = generic { version = "4.9.1"; sha256 = "sha256-Qm0qqYB/CLVHUgKE9N83MgAWQ2YFdumrB0i84qYNto8="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768bf1dc0f0..47fba8bd906 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25375,10 +25375,7 @@ with pkgs; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; wt = wt4; - inherit (callPackages ../development/libraries/wt { - boost = boost175; - }) - wt3 + inherit (libsForQt5.callPackage ../development/libraries/wt { }) wt4; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; From 42cb5fd8b443b695af1704f70c120c3acadd03ea Mon Sep 17 00:00:00 2001 From: chewblacka Date: Tue, 8 Aug 2023 22:40:25 +0100 Subject: [PATCH 07/88] maintainers: add jgarcia Added jgarcia to list of maintainers --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef4214842e1..c7101715480 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7845,6 +7845,11 @@ githubId = 31008330; name = "Jann Marc Villablanca"; }; + jgarcia = { + github = "chewblacka"; + githubId = 18430320; + name = "John Garcia"; + }; jgart = { email = "jgart@dismail.de"; github = "jgarte"; From d4b5bf5949c7e046e4b7f4554db63a532281dd6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 01:19:33 +0000 Subject: [PATCH 08/88] fluidd: 1.24.2 -> 1.25.0 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 4faa7a7eac2..2b0cd7de054 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.24.2"; + version = "1.25.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk="; + sha256 = "sha256-p8NesTNwsiq4YiEHtBpYP6eljs4PvDaQ2Ot6/htvzr4="; }; nativeBuildInputs = [ unzip ]; From 9adbc6eca4e0cd62c3e2f6fae6ab52b527ba953e Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 9 Aug 2023 13:33:19 +0200 Subject: [PATCH 09/88] linuxPackages.nvidia_x11.settings: fix wayland support --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 5570228d78b..454a72739b3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -52,6 +52,12 @@ stdenv.mkDerivation { # fixes "multiple definition of `VDPAUDeviceFunctions'" linking errors url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch"; hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak="; + }) + ++ lib.optional (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + (fetchpatch { + # fix wayland support for compositors that use wl_output version 4 + url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch"; + hash = "sha256-wKuO5CUTUuwYvsP46Pz+6fI0yxLNpZv8qlbL0TFkEFE="; }); postPatch = lib.optionalString nvidia_x11.useProfiles '' From 89fe2268286ca01ac72df73ea6dbc2aa74925201 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 13:21:44 +0000 Subject: [PATCH 10/88] clojure-lsp: 2023.07.01-22.35.41 -> 2023.08.06-00.28.06 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 0fe478fdf5c..5102c8deed0 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2023.07.01-22.35.41"; + version = "2023.08.06-00.28.06"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-/gpynrmu9O6nRH5TzfXwxbPbpk7c6ZzwR6cp8F2puUM="; + sha256 = "sha256-wc7M2cPRtdaRzZn3GNu/aCbQ2VqxiDxvu/b7qnBVUBo="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "90457834b079eea57d07b62a1281ebe91b7449d61da0f6e20d5b9f8f8163e525"; + sha256 = "c301821ac6914999a44f5c1cd371d46b248fe9a2e31d43a666d0bc2656cfdd78"; }; extraNativeImageBuildArgs = [ From 22e0cd0da481a6b08d461a2c3e9d25f3a52c8e83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 22:51:02 +0000 Subject: [PATCH 11/88] hiredis: 1.1.0 -> 1.2.0 --- pkgs/development/libraries/hiredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 6431dc5a171..f3be75f0dcb 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "sha256-0ESRnZTL6/vMpek+2sb0YQU3ajXtzj14yvjfOSQYjf4="; + sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg="; }; PREFIX = "\${out}"; From 04696a92a87504bda9ef1844db812ae4695391dc Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 10 Aug 2023 13:22:00 +1000 Subject: [PATCH 12/88] cozydrive: 3.32.0 -> 3.38.0 --- pkgs/applications/networking/cozy-drive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 9c0fda32ace..c945576f32e 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -5,12 +5,12 @@ let pname = "cozydrive"; - version = "3.32.0"; + version = "3.38.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a"; + sha256 = "3liOzZVOjtV1cGrKlOKiFRRqnt8KHPr5Ye5HU0e/BYo="; }; appimageContents = appimageTools.extract { inherit name src; }; From 933501dc92b5fc91273c496101ea5349910fe717 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 10 Aug 2023 19:17:35 +0100 Subject: [PATCH 13/88] gnutls: add openconnect and samba to passthru.tests samba having been originally included in args but forgotten from passthru.tests --- pkgs/development/libraries/gnutls/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2a6d0d1088b..782df53fc4b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -18,6 +18,7 @@ , python3Packages , qemu , rsyslog +, openconnect , samba }: @@ -106,7 +107,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver; + inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver samba openconnect; inherit (ocamlPackages) ocamlnet; haskell-gnutls = haskellPackages.gnutls; python3-gnutls = python3Packages.python3-gnutls; From 7c005a7b69437f2068d9b4ded03dc79ff8afb0de Mon Sep 17 00:00:00 2001 From: Hadi Date: Thu, 10 Aug 2023 20:09:15 -0400 Subject: [PATCH 14/88] androidenv fix cmdline beta versions' problem --- pkgs/development/mobile/androidenv/cmdline-tools.nix | 8 ++++---- .../mobile/androidenv/compose-android-packages.nix | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index b3ca1c171b6..11ad37453f2 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, postInstall}: deployAndroidPackage { name = "androidsdk"; @@ -16,7 +16,7 @@ deployAndroidPackage { export ANDROID_SDK_ROOT="$out/libexec/android-sdk" # Wrap all scripts that require JAVA_HOME - find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do + find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do if grep -q "JAVA_HOME" $program; then wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \ --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT @@ -24,12 +24,12 @@ deployAndroidPackage { done # Wrap sdkmanager script - wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \ + wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \ --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \ --add-flags "--sdk_root=$ANDROID_SDK_ROOT" # Patch all script shebangs - patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin + patchShebangs $ANDROID_SDK_ROOT/${package.path}/bin cd $ANDROID_SDK_ROOT ${postInstall} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 4777e7f95a7..ccd0907c9e9 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -314,6 +314,8 @@ rec { '') plugins} ''; # */ + cmdline-tools-package = check-version packages "cmdline-tools" cmdLineToolsVersion; + # This derivation deploys the tools package and symlinks all the desired # plugins that we want to use. If the license isn't accepted, prints all the licenses # requested and throws. @@ -329,9 +331,9 @@ rec { by an environment variable for a single invocation of the nix tools. $ export NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 '' else callPackage ./cmdline-tools.nix { - inherit deployAndroidPackage os cmdLineToolsVersion; + inherit deployAndroidPackage os; - package = check-version packages "cmdline-tools" cmdLineToolsVersion; + package = cmdline-tools-package; postInstall = '' # Symlink all requested plugins @@ -375,7 +377,7 @@ rec { ln -s $i $out/bin done - find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -type f -executable | while read i; do + find $ANDROID_SDK_ROOT/${cmdline-tools-package.path}/bin -type f -executable | while read i; do ln -s $i $out/bin done From 430200fe0699d9a0a55ca185208cb941efbdf871 Mon Sep 17 00:00:00 2001 From: Hadi Date: Thu, 10 Aug 2023 20:27:06 -0400 Subject: [PATCH 15/88] androidenv update packages --- .../androidenv/compose-android-packages.nix | 8 +- .../examples/shell-with-emulator.nix | 12 +- .../mobile/androidenv/examples/shell.nix | 21 +- pkgs/development/mobile/androidenv/repo.json | 1739 +++++++++++++---- 4 files changed, 1330 insertions(+), 450 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 4777e7f95a7..4ae136d52c5 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -2,12 +2,12 @@ , licenseAccepted ? false }: -{ cmdLineToolsVersion ? "9.0" +{ cmdLineToolsVersion ? "11.0" , toolsVersion ? "26.1.1" -, platformToolsVersion ? "34.0.1" -, buildToolsVersions ? [ "33.0.2" ] +, platformToolsVersion ? "34.0.4" +, buildToolsVersions ? [ "34.0.0" ] , includeEmulator ? false -, emulatorVersion ? "33.1.6" +, emulatorVersion ? "32.1.14" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 9270f33f2b6..4cee79824a6 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -26,7 +26,7 @@ let # Declaration of versions for everything. This is useful since these # versions may be used in multiple places in this Nix expression. android = { - platforms = [ "33" ]; + platforms = [ "34" ]; systemImageTypes = [ "google_apis" ]; abis = [ "arm64-v8a" "x86_64" ]; }; @@ -115,10 +115,10 @@ pkgs.mkShell rec { echo "installed_packages_section: ''${installed_packages_section}" packages=( - "build-tools;33.0.2" "cmdline-tools;9.0" \ - "emulator" "patcher;v4" "platform-tools" "platforms;android-33" \ - "system-images;android-33;google_apis;arm64-v8a" \ - "system-images;android-33;google_apis;x86_64" + "build-tools;34.0.0" "cmdline-tools;11.0" \ + "emulator" "patcher;v4" "platform-tools" "platforms;android-34" \ + "system-images;android-34;google_apis;arm64-v8a" \ + "system-images;android-34;google_apis;x86_64" ) for package in "''${packages[@]}"; do @@ -135,7 +135,7 @@ pkgs.mkShell rec { nativeBuildInputs = [ androidSdk androidEmulator jdk ]; } '' avdmanager delete avd -n testAVD || true - echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64' + echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64' result=$(avdmanager list avd) if [[ ! $result =~ "Name: testAVD" ]]; then diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index cea510a3251..67e6421dbba 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -25,18 +25,18 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - cmdLineToolsVersion = "9.0"; - platformTools = "34.0.1"; - buildTools = "33.0.2"; + cmdLineToolsVersion = "11.0"; + platformTools = "34.0.4"; + buildTools = "34.0.0"; ndk = [ "25.1.8937393" # LTS NDK - "25.2.9519653" + "26.0.10404224-rc1" ]; cmake = "3.6.4111459"; - emulator = "33.1.6"; + emulator = "33.1.17"; }; - platforms = ["23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33"]; + platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ]; abis = ["armeabi-v7a" "arm64-v8a"]; extras = ["extras;google;gcm"]; }; @@ -165,19 +165,20 @@ pkgs.mkShell rec { installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') packages=( - "build-tools;33.0.2" "platform-tools" \ + "build-tools;34.0.0" "platform-tools" \ "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ - "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \ "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ - "sources;android-31" "sources;android-32" "sources;android-33" \ + "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \ "system-images;android-28;google_apis_playstore;arm64-v8a" \ "system-images;android-29;google_apis_playstore;arm64-v8a" \ "system-images;android-30;google_apis_playstore;arm64-v8a" \ "system-images;android-31;google_apis_playstore;arm64-v8a" \ "system-images;android-32;google_apis_playstore;arm64-v8a" \ - "system-images;android-33;google_apis_playstore;arm64-v8a" + "system-images;android-33;google_apis_playstore;arm64-v8a" \ + "system-images;android-34;google_apis_playstore;arm64-v8a" ) for package in "''${packages[@]}"; do diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index a0ebaa9aff9..ecb649bba97 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -11,7 +11,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -64,7 +64,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -110,7 +110,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -161,7 +161,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -198,7 +198,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -249,7 +249,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -286,7 +286,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -339,7 +339,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -399,7 +399,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -459,7 +459,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -519,7 +519,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -579,7 +579,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -639,7 +639,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -699,7 +699,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -759,7 +759,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -819,7 +819,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -879,7 +879,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -939,7 +939,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -985,7 +985,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1031,7 +1031,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1077,7 +1077,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1123,7 +1123,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1169,7 +1169,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1215,7 +1215,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1262,7 +1262,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1292,7 +1292,7 @@ } ], "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer: Deprecated)", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1322,7 +1322,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1350,7 +1350,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1378,7 +1378,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1413,7 +1413,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1441,7 +1441,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1469,7 +1469,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1506,7 +1506,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1534,7 +1534,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1562,7 +1562,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1591,7 +1591,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1619,7 +1619,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1647,7 +1647,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -1675,7 +1675,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", @@ -1703,7 +1703,7 @@ } ], "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", @@ -1731,7 +1731,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-alpha8", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", @@ -1759,7 +1759,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", @@ -1787,7 +1787,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", @@ -1815,7 +1815,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", @@ -1843,7 +1843,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", @@ -1871,7 +1871,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta5", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", @@ -1899,7 +1899,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", @@ -1927,7 +1927,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", @@ -1962,7 +1962,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", @@ -1997,7 +1997,7 @@ } }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", @@ -2032,7 +2032,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", @@ -2067,7 +2067,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", @@ -2102,7 +2102,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", @@ -2137,7 +2137,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", @@ -2172,7 +2172,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", @@ -2207,7 +2207,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", @@ -2242,7 +2242,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", @@ -2277,7 +2277,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", @@ -2316,7 +2316,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2354,7 +2354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2394,7 +2394,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2435,7 +2435,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2473,7 +2473,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2515,7 +2515,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2553,7 +2553,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2593,7 +2593,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2634,7 +2634,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2679,7 +2679,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2710,7 +2710,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2748,7 +2748,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2788,7 +2788,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2829,7 +2829,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2874,7 +2874,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2905,7 +2905,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2943,7 +2943,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2986,7 +2986,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3027,7 +3027,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3072,7 +3072,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3110,7 +3110,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3150,7 +3150,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3191,7 +3191,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3236,7 +3236,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3274,7 +3274,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3314,7 +3314,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3355,7 +3355,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3393,7 +3393,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3423,7 +3423,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3455,7 +3455,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3493,7 +3493,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3531,7 +3531,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3569,7 +3569,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3602,7 +3602,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3643,7 +3643,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3684,7 +3684,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3725,7 +3725,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3763,7 +3763,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3795,7 +3795,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3833,7 +3833,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3871,7 +3871,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3909,7 +3909,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3942,7 +3942,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3983,7 +3983,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4024,7 +4024,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4103,7 +4103,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4140,7 +4140,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4172,7 +4172,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4210,7 +4210,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4248,7 +4248,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4286,7 +4286,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4319,7 +4319,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4360,7 +4360,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4401,7 +4401,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4442,7 +4442,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4487,7 +4487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4519,7 +4519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4557,7 +4557,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4595,7 +4595,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4633,7 +4633,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4673,7 +4673,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4714,7 +4714,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4755,7 +4755,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4798,7 +4798,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4843,7 +4843,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4882,7 +4882,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4919,7 +4919,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4951,7 +4951,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4989,7 +4989,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5027,7 +5027,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5060,7 +5060,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5101,7 +5101,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5142,7 +5142,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5226,7 +5226,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5281,7 +5281,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5320,7 +5320,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5364,7 +5364,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5401,7 +5401,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5438,7 +5438,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5482,7 +5482,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -5533,7 +5533,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5584,7 +5584,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5637,7 +5637,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5682,7 +5682,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5726,7 +5726,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5763,7 +5763,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5800,7 +5800,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5844,7 +5844,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -5895,7 +5895,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5948,7 +5948,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -5993,7 +5993,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6032,7 +6032,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6076,7 +6076,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6106,7 +6106,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6136,7 +6136,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6180,7 +6180,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6231,7 +6231,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6282,7 +6282,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6330,7 +6330,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6381,7 +6381,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6432,7 +6432,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6487,7 +6487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6519,7 +6519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6573,7 +6573,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6627,7 +6627,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6671,7 +6671,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -6717,7 +6717,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6763,7 +6763,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6817,7 +6817,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -6880,7 +6880,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -6943,7 +6943,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -6998,7 +6998,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7037,7 +7037,7 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", @@ -7074,7 +7074,7 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", @@ -7100,19 +7100,19 @@ "archives": [ { "os": "all", - "sha1": "2462af138023fbbd1114421818890884d4ebceab", - "size": 548363604, - "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-30_r01.zip" + "sha1": "e96298145a5e0bfd6da4816f51b06c520d8dba72", + "size": 548363615, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-30_r02.zip" } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", "revision": "30-default-arm64-v8a", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:2": "arm64-v8a", @@ -7148,7 +7148,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7174,9 +7174,9 @@ "archives": [ { "os": "all", - "sha1": "14393e29f2b1021d4bfece3a1cb29af745e95dac", - "size": 1244095258, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r11.zip" + "sha1": "348aa8836d855745dd89295356330ad0b5622cb3", + "size": 1244297361, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r12.zip" } ], "dependencies": { @@ -7192,13 +7192,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19579, + "license": "android-sdk-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", "revision": "30-google_apis-arm64-v8a", "revision-details": { - "major:0": "11" + "major:0": "12" }, "type-details": { "abi:3": "arm64-v8a", @@ -7243,7 +7243,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -7294,7 +7294,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -7348,7 +7348,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7411,7 +7411,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7474,7 +7474,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7529,7 +7529,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7576,7 +7576,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7620,7 +7620,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7662,7 +7662,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7711,7 +7711,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -7739,9 +7739,9 @@ "archives": [ { "os": "all", - "sha1": "93d3bb0fc37e5cb144eabb0158a98b988d4bb31c", - "size": 1470788213, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-31_r13.zip" + "sha1": "9aedd3e85cad7a479146f6858f4a94840c2a3f29", + "size": 1470822277, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-31_r14.zip" } ], "dependencies": { @@ -7762,13 +7762,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", "revision": "31-google_apis-x86_64", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "abi:3": "x86_64", @@ -7821,7 +7821,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -7872,7 +7872,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -7927,7 +7927,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -7978,7 +7978,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -8037,7 +8037,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -8100,7 +8100,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -8155,7 +8155,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8202,7 +8202,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8241,7 +8241,7 @@ } }, "displayName": "Wear OS 4 - Preview ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -8278,7 +8278,7 @@ } }, "displayName": "Wear OS 4 - Preview Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -8304,9 +8304,9 @@ "archives": [ { "os": "all", - "sha1": "db779eab0a09e169bc08a5726da026327353e290", - "size": 1629964094, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r09.zip" + "sha1": "5efee22c6b46ca0b0614d2881e1f8170fbf5649d", + "size": 1629988084, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r13.zip" } ], "dependencies": { @@ -8327,13 +8327,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", "revision": "33-google_apis-arm64-v8a", "revision-details": { - "major:0": "9" + "major:0": "13" }, "type-details": { "abi:3": "arm64-v8a", @@ -8355,9 +8355,9 @@ "archives": [ { "os": "all", - "sha1": "049e63603414c044724ead42232b962b90ee6238", - "size": 1545070133, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r10.zip" + "sha1": "50bc7f4082ea5dcb2e51fd65ddf243f934bcb40a", + "size": 1545116967, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r13.zip" } ], "dependencies": { @@ -8378,13 +8378,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", "revision": "33-google_apis-x86_64", "revision-details": { - "major:0": "10" + "major:0": "13" }, "type-details": { "abi:3": "x86_64", @@ -8437,7 +8437,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -8488,7 +8488,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -8514,6 +8514,318 @@ } } }, + "34": { + "android-tv": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "d8ec0e59b3ba2c5d43cfc403bc1baffff40007ac", + "size": 880769986, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV ARM 64 v8a System Image", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "system-image-34-android-tv-arm64-v8a", + "path": "system-images/android-34/android-tv/arm64-v8a", + "revision": "34-android-tv-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "33257a883decee2c120893f739d3a1806afdc3ca", + "size": 868584259, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, + "displayName": "Android TV Intel x86 Atom System Image", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "system-image-34-android-tv-x86", + "path": "system-images/android-34/android-tv/x86", + "revision": "34-android-tv-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "e910dfb0002f52753933399ea93957023d2d2e60", + "size": 1592115349, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 19579, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-34-google_apis-arm64-v8a", + "path": "system-images/android-34/google_apis/arm64-v8a", + "revision": "34-google_apis-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "ad1a351d22ea0cfb3fe30201da3d410c24d9fd9d", + "size": 1545718157, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "system-image-34-google_apis-x86_64", + "path": "system-images/android-34/google_apis/x86_64", + "revision": "34-google_apis-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "43aa221d54537389d69ac49111b352362af490b8", + "size": 1553043568, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r07-darwin.zip" + }, + { + "os": "linux", + "sha1": "43aa221d54537389d69ac49111b352362af490b8", + "size": 1553043568, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r07-linux.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 19579, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-34-google_apis_playstore-arm64-v8a", + "path": "system-images/android-34/google_apis_playstore/arm64-v8a", + "revision": "34-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "29d3e349cc906f3eec80c8238898ebaed6e62233", + "size": 1514892655, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34_r07.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "system-image-34-google_apis_playstore-x86_64", + "path": "system-images/android-34/google_apis_playstore/x86_64", + "revision": "34-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, "TiramisuPrivacySandbox": { "google_apis_playstore": { "arm64-v8a": { @@ -8549,7 +8861,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", @@ -8601,7 +8913,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", @@ -8847,6 +9159,120 @@ } } } + }, + "UpsideDownCakePrivacySandbox": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "a312b771639410ede98d101e21f0d113201d2cc4", + "size": 1513441966, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r01-darwin.zip" + }, + { + "os": "linux", + "sha1": "a312b771639410ede98d101e21f0d113201d2cc4", + "size": 1513441966, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r01-linux.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 19579, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", + "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a", + "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "33", + "codename:1": "UpsideDownCakePrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "687378b8490f67bbb9b081fdf50c3c86f7f6a6bb", + "size": 1464123578, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCakePrivacySandbox_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", + "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64", + "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "33", + "codename:1": "UpsideDownCakePrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } } }, "licenses": { @@ -8906,7 +9332,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -8952,7 +9378,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -8998,7 +9424,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9044,7 +9470,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9090,7 +9516,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9136,7 +9562,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9182,7 +9608,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9228,7 +9654,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9274,7 +9700,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -9319,7 +9745,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -9364,7 +9790,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9410,7 +9836,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9456,7 +9882,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9502,7 +9928,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9548,7 +9974,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9594,7 +10020,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -9639,7 +10065,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9685,7 +10111,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -9730,7 +10156,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9776,7 +10202,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -9821,7 +10247,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -9866,7 +10292,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -9911,7 +10337,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -9956,7 +10382,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -10001,7 +10427,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -10046,7 +10472,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -10091,7 +10517,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -10136,7 +10562,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -10181,7 +10607,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -10226,7 +10652,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -10271,7 +10697,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -10316,7 +10742,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -10361,7 +10787,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -10406,7 +10832,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -10451,7 +10877,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -10496,7 +10922,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -10541,7 +10967,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -10586,7 +11012,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -10631,7 +11057,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -10676,7 +11102,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -10723,7 +11149,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -10770,7 +11196,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -10815,7 +11241,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -10860,7 +11286,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -10905,7 +11331,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -10950,7 +11376,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -10997,7 +11423,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11044,7 +11470,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11091,7 +11517,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -11136,7 +11562,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -11181,7 +11607,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -11226,7 +11652,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -11271,7 +11697,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -11316,7 +11742,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -11361,7 +11787,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -11399,7 +11825,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -11437,7 +11863,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -11475,7 +11901,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -11514,7 +11940,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -11552,7 +11978,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -11590,7 +12016,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -11606,6 +12032,44 @@ } } }, + "34.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "d6d58e0c6925a9e4d9a541e84cd1f405c2f9d2a9", + "size": 61224257, + "url": "https://dl.google.com/android/repository/build-tools_r34-linux.zip" + }, + { + "os": "macosx", + "sha1": "00e1301387028f33753e38274401694e1a27c62f", + "size": 76559180, + "url": "https://dl.google.com/android/repository/build-tools_r34-macosx.zip" + }, + { + "os": "windows", + "sha1": "62cfde1b6fcc3ad12a4d2ba1b537e752768bfd47", + "size": 58253258, + "url": "https://dl.google.com/android/repository/build-tools_r34-windows.zip" + } + ], + "displayName": "Android SDK Build-Tools 34", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/34.0.0", + "revision": "34.0.0", + "revision-details": { + "major:0": "34", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "34.0.0-rc1": { "archives": [ { @@ -11628,7 +12092,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -11667,7 +12131,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -11706,7 +12170,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -11786,7 +12250,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -11824,7 +12288,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -11862,7 +12326,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -11900,7 +12364,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -11940,7 +12404,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -11955,6 +12419,43 @@ } } }, + "10.0": { + "archives": [ + { + "os": "linux", + "sha1": "a787f0c35d3970f2ad634f7d91a2e7bc49e2c7f5", + "size": 138733165, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip" + }, + { + "os": "macosx", + "sha1": "2a0c97c8d9b11f9a64be0a7058bcdbf1aaab9910", + "size": 138733149, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-9862592_latest.zip" + }, + { + "os": "windows", + "sha1": "5a03c5ce16f4c99ffe7bded82798b01b07a79bc0", + "size": 138709020, + "url": "https://dl.google.com/android/repository/commandlinetools-win-9862592_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/10.0", + "revision": "10.0", + "revision-details": { + "major:0": "10", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "10.0-rc04": { "archives": [ { @@ -11993,6 +12494,81 @@ } } }, + "11.0": { + "archives": [ + { + "os": "linux", + "sha1": "87b485c7283cba69e41c10f05bf832d2fd691552", + "size": 148832188, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" + }, + { + "os": "macosx", + "sha1": "4b831e6a978ce9170fc49a8010e2ece4be790c73", + "size": 148832172, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip" + }, + { + "os": "windows", + "sha1": "9b0082db87cf1738866f80160f497b8a53e149a3", + "size": 148808043, + "url": "https://dl.google.com/android/repository/commandlinetools-win-10406996_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/11.0", + "revision": "11.0", + "revision-details": { + "major:0": "11", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "11.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "26048ffc9a0b0b6ef0fe491e3796486d2387f043", + "size": 148831286, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-10320515_latest.zip" + }, + { + "os": "macosx", + "sha1": "8cf501a4efbcc3be6bc15a48ad17fcda8bf03116", + "size": 148831270, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-10320515_latest.zip" + }, + { + "os": "windows", + "sha1": "fe8694f50bf5b132c0c92f4a695f51aac71c8f27", + "size": 148807141, + "url": "https://dl.google.com/android/repository/commandlinetools-win-10320515_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/11.0-rc01", + "revision": "11.0-rc01", + "revision-details": { + "major:0": "11", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "11.0-rc07": { "archives": [ { @@ -12031,6 +12607,44 @@ } } }, + "12.0-rc15": { + "archives": [ + { + "os": "linux", + "sha1": "9f67d98e686616bf92122b03051f02f695b11415", + "size": 153543827, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-10572941_latest.zip" + }, + { + "os": "macosx", + "sha1": "feac1c4ad5e78e506cb55216181f3c5b58219e90", + "size": 153543811, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-10572941_latest.zip" + }, + { + "os": "windows", + "sha1": "4956c615fa087f5a716ffde76684085366c5a5bf", + "size": 153519682, + "url": "https://dl.google.com/android/repository/commandlinetools-win-10572941_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/12.0-alpha15", + "revision": "12.0-rc15", + "revision-details": { + "major:0": "12", + "minor:1": "0", + "preview:2": "15" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "2.0": { "archives": [ { @@ -12053,7 +12667,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -12091,7 +12705,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -12128,7 +12742,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -12165,7 +12779,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -12202,7 +12816,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -12239,7 +12853,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -12276,7 +12890,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -12313,7 +12927,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -12350,7 +12964,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -12486,7 +13100,7 @@ } }, "displayName": "Android Emulator", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "emulator", "path": "emulator", @@ -12547,6 +13161,51 @@ } } }, + "32.1.14": { + "archives": [ + { + "os": "linux", + "sha1": "04bab7711660fc9891fd5dec347a9f533a87af1a", + "size": 270178945, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-10330179.zip" + }, + { + "os": "windows", + "sha1": "f039bd816f82cda85ee4a2e14497bd00a1998867", + "size": 333010879, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-10330179.zip" + }, + { + "os": "macosx", + "sha1": "3db11e3541bfced7dbaadc976a13045fd7e1bbcc", + "size": 309337702, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10330179.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Emulator", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "32.1.14", + "revision-details": { + "major:0": "32", + "micro:2": "14", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "32.1.8": { "archives": [ { @@ -12637,6 +13296,51 @@ } } }, + "33.1.17": { + "archives": [ + { + "os": "macosx", + "sha1": "cd989b0594ebe9382749b3a5dc026acb326e4de0", + "size": 341193257, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10594030.zip" + }, + { + "os": "linux", + "sha1": "72c3fb1591755ee5f5d662114a394d08247efc13", + "size": 261440080, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-10594030.zip" + }, + { + "os": "windows", + "sha1": "cc302b5107e64348e957e4738530bcfbb58212a8", + "size": 363656447, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-10594030.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Android Emulator", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "33.1.17", + "revision-details": { + "major:0": "33", + "micro:2": "17", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "33.1.4": { "archives": [ { @@ -12751,7 +13455,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -12788,7 +13492,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -12834,7 +13538,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -12879,7 +13583,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -12924,7 +13628,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -12969,7 +13673,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -13015,7 +13719,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -13060,7 +13764,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -13107,7 +13811,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -13154,7 +13858,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -13199,7 +13903,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -13244,7 +13948,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -13290,7 +13994,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -13335,7 +14039,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -13381,7 +14085,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -13427,7 +14131,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -13472,7 +14176,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -13518,7 +14222,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -13563,7 +14267,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -13608,7 +14312,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -13653,7 +14357,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -13699,7 +14403,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -13744,7 +14448,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -13789,7 +14493,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -13835,7 +14539,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -13881,7 +14585,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -13927,7 +14631,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -13973,7 +14677,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -14019,7 +14723,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -14065,7 +14769,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -14110,7 +14814,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -14155,7 +14859,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -14200,7 +14904,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -14246,7 +14950,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -14292,7 +14996,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -14338,7 +15042,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -14383,7 +15087,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -14429,7 +15133,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -14475,7 +15179,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -14521,7 +15225,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -14567,7 +15271,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -14612,7 +15316,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -14657,7 +15361,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -14672,6 +15376,52 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "26.0.10404224-rc1": { + "archives": [ + { + "os": "macosx", + "sha1": "d6dbb122cf3fc52a64ae0d19d120a01ce0052f3b", + "size": 983730774, + "url": "https://dl.google.com/android/repository/android-ndk-r26-beta1-darwin.zip" + }, + { + "os": "linux", + "sha1": "fb5e34313766764d9654b04603e69af813b18799", + "size": 668699088, + "url": "https://dl.google.com/android/repository/android-ndk-r26-beta1-linux.zip" + }, + { + "os": "windows", + "sha1": "bcdc60cf0149fc862cbb5514e7879d8c46c6e1e0", + "size": 664889266, + "url": "https://dl.google.com/android/repository/android-ndk-r26-beta1-windows.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "NDK (Side by side) 26.0.10404224", + "last-available-day": 19579, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/26.0.10404224", + "revision": "26.0.10404224-rc1", + "revision-details": { + "major:0": "26", + "micro:2": "10404224", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -14704,7 +15454,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -14749,7 +15499,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -14794,7 +15544,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -14839,7 +15589,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -14885,7 +15635,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -14930,7 +15680,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -14977,7 +15727,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -15024,7 +15774,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15069,7 +15819,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15114,7 +15864,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15160,7 +15910,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15205,7 +15955,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15251,7 +16001,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15297,7 +16047,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15342,7 +16092,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15388,7 +16138,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15433,7 +16183,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15478,7 +16228,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15523,7 +16273,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15569,7 +16319,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15614,7 +16364,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15659,7 +16409,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15705,7 +16455,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15751,7 +16501,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15797,7 +16547,7 @@ } }, "displayName": "NDK", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15826,7 +16576,7 @@ } ], "displayName": "SDK Patch Applier v4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "patcher", "path": "patcher/v4", @@ -15917,6 +16667,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "34.0.4": { + "archives": [ + { + "os": "macosx", + "sha1": "ecc476b9801fcb6ea61605eedf60f85217964f09", + "size": 11208015, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-darwin.zip" + }, + { + "os": "linux", + "sha1": "faaac1c05af0e3fa20baee6e8970d96fb53bfe58", + "size": 6325905, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-linux.zip" + }, + { + "os": "windows", + "sha1": "d245eedc17259b15e799c312e9014f78aea3da21", + "size": 5992467, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.4-windows.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "34.0.4", + "revision-details": { + "major:0": "34", + "micro:2": "4", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -15930,7 +16718,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -15962,7 +16750,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -15994,7 +16782,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -16026,7 +16814,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -16058,7 +16846,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -16090,7 +16878,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -16122,7 +16910,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -16154,7 +16942,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -16186,7 +16974,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -16218,7 +17006,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -16262,7 +17050,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -16295,7 +17083,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -16327,7 +17115,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -16359,7 +17147,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -16391,7 +17179,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -16423,7 +17211,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -16455,7 +17243,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -16487,7 +17275,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -16519,7 +17307,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -16551,7 +17339,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -16583,7 +17371,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -16627,7 +17415,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -16660,7 +17448,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -16692,7 +17480,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -16724,7 +17512,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -16756,7 +17544,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -16778,6 +17566,38 @@ } } }, + "34": { + "archives": [ + { + "os": "all", + "sha1": "618f593e7d30c1c9ff530d1bf2fec155d47d43e0", + "size": 63180660, + "url": "https://dl.google.com/android/repository/platform-34-ext7_r01.zip" + } + ], + "displayName": "Android SDK Platform 34", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-34", + "revision": "34", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "34", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } + }, "4": { "archives": [ { @@ -16800,7 +17620,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -16845,7 +17665,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -16890,7 +17710,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -16923,7 +17743,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -16955,7 +17775,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -16987,7 +17807,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -17019,7 +17839,7 @@ } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", @@ -17050,9 +17870,10 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-UpsideDownCake", "revision": "UpsideDownCake", "revision-details": { @@ -17070,6 +17891,37 @@ } } } + }, + "UpsideDownCakePrivacySandbox": { + "archives": [ + { + "os": "all", + "sha1": "e8d6d1516e2ac0feb0e0ec20bcfb2fce483b961e", + "size": 63911495, + "url": "https://dl.google.com/android/repository/platform-UpsideDownCakePrivacySandbox_r01.zip" + } + ], + "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-UpsideDownCakePrivacySandbox", + "revision": "UpsideDownCakePrivacySandbox", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33", + "codename:1": "UpsideDownCakePrivacySandbox", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } } }, "skiaparser": { @@ -17131,7 +17983,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -17167,7 +18019,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -17193,7 +18045,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -17221,7 +18073,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -17248,7 +18100,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -17275,7 +18127,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -17302,7 +18154,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -17329,7 +18181,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -17356,7 +18208,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -17383,7 +18235,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -17410,7 +18262,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -17437,7 +18289,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -17464,7 +18316,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -17491,7 +18343,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -17518,7 +18370,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -17545,7 +18397,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -17572,7 +18424,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -17599,7 +18451,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -17626,7 +18478,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -17653,7 +18505,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -17680,7 +18532,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -17707,7 +18559,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -17723,6 +18575,33 @@ "xsi:type": "ns11:sourceDetailsType" } } + }, + "34": { + "archives": [ + { + "os": "all", + "sha1": "41f67d064dbe84f32a763d65a05c40285c2fbb70", + "size": 53812451, + "url": "https://dl.google.com/android/repository/sources-34_r01.zip" + } + ], + "displayName": "Sources for Android 34", + "last-available-day": 19579, + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-34", + "revision": "34", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "34", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -17768,7 +18647,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 19489, + "last-available-day": 19579, "license": "android-sdk-license", "name": "tools", "obsolete": "true", From 2cd448db9757c6ac8d739f6f26b23f77d78ff410 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Aug 2023 04:06:49 +0000 Subject: [PATCH 16/88] libcef: 115.3.11 -> 115.3.13 --- pkgs/development/libraries/libcef/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 0c9efaf69f3..0b045a0bd3c 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "1348821cprfy46fvzipqfy9qmv1jw48dsi2nxnk3k1097c6xb9zq"; - platforms."x86_64-linux".sha256 = "0w58bqys331wssfqrv27v1fbvrgj4hs1kyjanld9vvdlna0x8kpg"; + platforms."aarch64-linux".sha256 = "06f7dm3k04ij2jczlvwkmfrb977x46lx0n0vyz8xl4kvf2x5psp8"; + platforms."x86_64-linux".sha256 = "09flbhddnl85m63rv70pmnfi2v8axjicad5blbrvdh2gj09g7y1r"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "115.3.11"; - gitRevision = "a61da9b"; - chromiumVersion = "115.0.5790.114"; + version = "115.3.13"; + gitRevision = "749b4d4"; + chromiumVersion = "115.0.5790.171"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; From 8d057dc00cde4b214a212223ca8dc6127d6d72d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Aug 2023 04:20:00 +0000 Subject: [PATCH 17/88] clair: 4.7.0 -> 4.7.1 Diff: https://github.com/quay/clair/compare/v4.7.0...v4.7.1 Changelog: https://github.com/quay/clair/blob/v4.7.1/CHANGELOG.md --- pkgs/tools/admin/clair/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 845aea8462c..59260d042f3 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-jnEnzIxI6S5AoUpfurOcf5N2Fo03QFNjxUzkn+i4h0Q="; + hash = "sha256-+ABZafDc2nmHHnJGXj4iCSheuWoksPwDblmdIusUJuo="; }; - vendorHash = "sha256-6UdTqnbtX4X4qACXW8uybyiOVOGXVw5HBNUvC/l1xfo="; + vendorHash = "sha256-ptgHU/PrLqRG4h3C5x+XUy4+38Yu6h4gTeziaPJ2iWE="; nativeBuildInputs = [ makeWrapper From e95f0c43f1b9681f36c45610d74890544a775c58 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 11 Aug 2023 15:43:53 +0900 Subject: [PATCH 18/88] python310Packages.librosa: support scipy 1.11 --- pkgs/development/python-modules/librosa/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index b00c895fd78..03cdeea14e5 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch # build-system , setuptools @@ -43,6 +44,15 @@ buildPythonPackage rec { hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; }; + patches = [ + # https://github.com/librosa/librosa/pull/1731 + (fetchpatch { + name = "support-scipy-1.11.patch"; + url = "https://github.com/librosa/librosa/commit/12dee8eabed7df14c5622b52c05393ddfeb11f4b.patch"; + hash = "sha256-JxTXU0Mc+QYpsafjoGLaIccD7EdCYJvIVianeosYpw4="; + }) + ]; + nativeBuildInputs = [ setuptools ]; From 8cde5d24019432c26a13a994b09de57281f01205 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 10 Aug 2023 18:09:34 -0400 Subject: [PATCH 19/88] gtk4-layer-shell: init at 1.0.1 --- .../libraries/gtk4-layer-shell/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/gtk4-layer-shell/default.nix diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix new file mode 100644 index 00000000000..ec1f00cdc36 --- /dev/null +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, wayland-scanner +, wayland +, gtk4 +, gobject-introspection +, vala +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gtk4-layer-shell"; + version = "1.0.1"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; + + src = fetchFromGitHub { + owner = "wmww"; + repo = "gtk4-layer-shell"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw="; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + vala + wayland-scanner + ]; + + buildInputs = [ + wayland + gtk4 + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dexamples=true" + ]; + + meta = with lib; { + description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ba26b924f4..c78ad8f71e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21769,6 +21769,8 @@ with pkgs; gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; + gtk4-layer-shell = callPackage ../development/libraries/gtk4-layer-shell { }; + gts = callPackage ../development/libraries/gts { }; gumbo = callPackage ../development/libraries/gumbo { }; From 624b952ba50ece91a72cb5e746af3326bf284fd5 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 9 Aug 2023 10:37:14 +0200 Subject: [PATCH 20/88] eid-mw: fix build by restoring p11-kit module installation path Since https://github.com/NixOS/nixpkgs/pull/244633, the installation path for p11-kit was picked up to be in the p11-kit out path, which obviously doesn't work. This commit restores the out path to the value it was before https://github.com/NixOS/nixpkgs/pull/244633. --- pkgs/tools/security/eid-mw/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 102313ddbdf..e399974b4c6 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,21 +1,21 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook , autoconf-archive -, pkg-config +, autoreconfHook , makeWrapper +, pkg-config +, substituteAll , curl , gtk3 , libassuan , libbsd , libproxy , libxml2 +, nssTools , openssl , p11-kit , pcsclite -, nssTools -, substituteAll }: stdenv.mkDerivation rec { @@ -30,8 +30,15 @@ stdenv.mkDerivation rec { hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY="; }; + postPatch = '' + sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac + substituteInPlace configure.ac --replace 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"' + ''; + + nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ]; + preConfigure = '' mkdir openssl ln -s ${lib.getLib openssl}/lib openssl @@ -44,10 +51,6 @@ stdenv.mkDerivation rec { # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry. configureFlags = [ "--disable-pinentry" ]; - postPatch = '' - sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac - ''; - postInstall = let eid-nssdb-in = substituteAll { From 62e81bf6bf754c0f4de4554538f51d4f71ba1699 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 8 Aug 2023 13:24:50 -0700 Subject: [PATCH 21/88] expidus.file-manager: 0.1.2 -> 0.2.0 --- .../desktops/expidus/file-manager/default.nix | 7 +- pkgs/desktops/expidus/file-manager/deps.json | 322 +++++++++--------- 2 files changed, 174 insertions(+), 155 deletions(-) diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix index ab22441984e..6c3285e1eb1 100644 --- a/pkgs/desktops/expidus/file-manager/default.nix +++ b/pkgs/desktops/expidus/file-manager/default.nix @@ -1,17 +1,17 @@ { lib, flutter, fetchFromGitHub }: flutter.buildFlutterApplication rec { pname = "expidus-file-manager"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ExpidusOS"; repo = "file-manager"; rev = version; - sha256 = "sha256-aAPmwzNPgu08Ov9NyRW5bcj3jQzG9rpWwrABRyK2Weg="; + hash = "sha256-p/bKVC1LpvVcyI3NYjQ//QL/6UutjVg649IZSmz4w9g="; }; depsListFile = ./deps.json; - vendorHash = "sha256-mPGrpMUguM9XAYWH8lBQuytxZ3J0gS2XOMPkKyFMLbc="; + vendorHash = "sha256-m2GCLC4ZUvDdBVKjxZjelrZZHY3+R7DilOOT84Twrxg="; postInstall = '' rm $out/bin/file_manager @@ -37,5 +37,6 @@ flutter.buildFlutterApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ RossComputerGuy ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "expidus-file-manager"; }; } diff --git a/pkgs/desktops/expidus/file-manager/deps.json b/pkgs/desktops/expidus/file-manager/deps.json index eb6c23b4e67..e1b391147a2 100644 --- a/pkgs/desktops/expidus/file-manager/deps.json +++ b/pkgs/desktops/expidus/file-manager/deps.json @@ -1,7 +1,7 @@ [ { "name": "file_manager", - "version": "0.1.2+1", + "version": "0.2.0+65656565656565", "kind": "root", "source": "root", "dependencies": [ @@ -29,6 +29,9 @@ "intl", "provider", "flutter_markdown", + "flutter_adaptive_scaffold", + "package_info_plus", + "pub_semver", "flutter_test", "flutter_lints" ] @@ -262,142 +265,20 @@ "source": "sdk", "dependencies": [] }, - { - "name": "flutter_markdown", - "version": "0.6.15", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "markdown", - "meta", - "path" - ] - }, - { - "name": "markdown", - "version": "7.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "args", - "meta" - ] - }, - { - "name": "args", - "version": "2.4.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "provider", - "version": "6.0.5", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "collection", - "flutter", - "nested" - ] - }, - { - "name": "nested", - "version": "1.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, - { - "name": "intl", - "version": "0.18.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "clock", - "meta", - "path" - ] - }, - { - "name": "filesize", - "version": "2.0.1", - "kind": "direct", - "source": "hosted", - "dependencies": [] - }, - { - "name": "pubspec", - "version": "2.3.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "path", - "pub_semver", - "yaml", - "uri" - ] - }, - { - "name": "uri", - "version": "1.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "matcher", - "quiver" - ] - }, - { - "name": "quiver", - "version": "3.2.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "matcher" - ] - }, - { - "name": "yaml", - "version": "3.1.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "source_span", - "string_scanner" - ] - }, { "name": "pub_semver", "version": "2.1.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "collection", - "meta" - ] - }, - { - "name": "sentry_flutter", - "version": "7.7.0", "kind": "direct", "source": "hosted", "dependencies": [ - "flutter", - "flutter_web_plugins", - "sentry", - "package_info_plus", + "collection", "meta" ] }, { "name": "package_info_plus", "version": "3.1.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [ "ffi", @@ -493,6 +374,137 @@ "vector_math" ] }, + { + "name": "flutter_adaptive_scaffold", + "version": "0.1.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_markdown", + "version": "0.6.15", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "markdown", + "version": "7.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "intl", + "version": "0.18.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "filesize", + "version": "2.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pubspec", + "version": "2.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "pub_semver", + "yaml", + "uri" + ] + }, + { + "name": "uri", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "sentry_flutter", + "version": "7.7.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "sentry", + "package_info_plus", + "meta" + ] + }, { "name": "sentry", "version": "7.7.0", @@ -543,7 +555,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.6", + "version": "2.1.7", "kind": "direct", "source": "hosted", "dependencies": [ @@ -556,7 +568,7 @@ }, { "name": "permission_handler", - "version": "10.2.0", + "version": "10.3.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -570,7 +582,7 @@ }, { "name": "permission_handler_platform_interface", - "version": "3.9.0", + "version": "3.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -591,7 +603,7 @@ }, { "name": "permission_handler_apple", - "version": "9.0.8", + "version": "9.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -601,7 +613,7 @@ }, { "name": "permission_handler_android", - "version": "10.2.2", + "version": "10.2.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -621,7 +633,7 @@ }, { "name": "shared_preferences", - "version": "2.1.1", + "version": "2.1.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -977,29 +989,14 @@ "flutter", "material_theme_builder", "libtokyo", + "flutter_localizations", "path", "intl", - "filesize" - ] - }, - { - "name": "libtokyo", - "version": "0.1.0", - "kind": "direct", - "source": "git", - "dependencies": [ - "meta", - "path" - ] - }, - { - "name": "material_theme_builder", - "version": "1.0.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "material_color_utilities" + "filesize", + "bitsdojo_window", + "shared_preferences", + "pubspec", + "url_launcher" ] }, { @@ -1019,5 +1016,26 @@ "path", "vector_math" ] + }, + { + "name": "libtokyo", + "version": "0.1.0", + "kind": "direct", + "source": "git", + "dependencies": [ + "meta", + "path", + "pubspec" + ] + }, + { + "name": "material_theme_builder", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "material_color_utilities" + ] } ] From e968b1693c09c2c34f36dfb086b42999e9f82103 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 7 Aug 2023 11:27:46 -0400 Subject: [PATCH 22/88] ouch: 0.4.1 -> 0.4.2 Diff: https://github.com/ouch-org/ouch/compare/0.4.1...0.4.2 Changelog: https://github.com/ouch-org/ouch/blob/0.4.2/CHANGELOG.md --- pkgs/tools/compression/ouch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index be18edfe46d..2c645bf56eb 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ouch"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "ouch-org"; - repo = pname; + repo = "ouch"; rev = version; - sha256 = "sha256-WzdKr0i31qNRm1EpMZ/W4fOfKKItmvz6BYFbJWcfoHo="; + hash = "sha256-XJOv7JFUJulEkGCMLxGi9nldHaPM/CUzyENIC2TdtoE="; }; - cargoSha256 = "sha256-UhKcWpNuRNyA+uUw5kx84Y2F1Swr05m7JUM1+9lXYPM="; + cargoHash = "sha256-TfAAU46rH6Jq0MuLRjbaVMRjzoSLYNAWBnUcT8DyIVg="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch ''; - OUCH_ARTIFACTS_FOLDER = "artifacts"; + env.OUCH_ARTIFACTS_FOLDER = "artifacts"; meta = with lib; { description = "A command-line utility for easily compressing and decompressing files and directories"; From 004188f3499701f0ef6c93a3ae23a84bb51097f7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 11 Aug 2023 22:48:55 +0400 Subject: [PATCH 23/88] =?UTF-8?q?iterm2:=203.4.19=20=E2=86=92=203.4.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/terminal-emulators/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index c547e3d0d76..4b62044ba2a 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.19"; + version = "3.4.20"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-UioKFhlwVdrkHtoS1ixXE2rykVO5aQeNQ8TnC5kNSUc="; + hash = "sha256-RXBv3RXd2Kq8k7rbOE3HPEf6vI64VZCo1IX03gDy7l0="; }; dontFixup = true; From 4b405d69ad231c85b6e6a5df3524c55d3f424bd4 Mon Sep 17 00:00:00 2001 From: chewblacka Date: Fri, 11 Aug 2023 20:12:46 +0100 Subject: [PATCH 24/88] remnote: added myself to maintainers Added myself (jgarcia) to list of maintainers for remnote --- pkgs/applications/misc/remnote/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 95e2be6f546..722e1b4bfa7 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -12,7 +12,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman ]; + maintainers = with maintainers; [ max-niederman jgarcia ]; license = licenses.unfree; platforms = platforms.linux; }; From 6fd0c4fd234bf18ebb83b94365d3def00d5e4f15 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 11 Aug 2023 15:37:34 -0400 Subject: [PATCH 25/88] src-cli: 5.1.0 -> 5.1.1 Diff: https://github.com/sourcegraph/src-cli/compare/5.1.0...5.1.1 Changelog: https://github.com/sourcegraph/src-cli/blob/5.1.1/CHANGELOG.md --- pkgs/development/tools/misc/src-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index 959b02d7258..f983d82846b 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "src-cli"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-sN6Ea1kJce8Jqy8YrkWzDrQDrmA8F+UYz7ZuqfdbnJ4="; + hash = "sha256-r9ugSs9I5K7yuAtOTWCKr3dHGBtmTQVehKqZ3ago1U4="; }; vendorHash = "sha256-A533f+FfEzU2TlNwHkD8gjeQYRATz85cCCmqLdl9290="; From 2e589b856ff6655377926abcc9e5037b80425590 Mon Sep 17 00:00:00 2001 From: Danylo Kondratiev Date: Fri, 11 Aug 2023 22:50:14 +0300 Subject: [PATCH 26/88] espup: 0.4.1 -> 0.5.0 https://github.com/esp-rs/espup/releases/tag/v0.5.0 --- pkgs/development/tools/espup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index 6ff3a2972a4..f71ef18487f 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-gzM+RT4Rt+LaYk7CwYUTIMci8DDI0y3+7y+N2yKRDOc="; + hash = "sha256-Eb0Q+Ju5nTXL0XvNhAo4Mc+ZP/vOfld313H9/oI3I2U="; }; - cargoHash = "sha256-GYhF6VDBAieZbu4x9EiQVVJkmx0aRYK0xwGGP0nuVGc="; + cargoHash = "sha256-ZKku6ElEtYXxwqeWTDKcCuZ4Wgqonc0B9nMyNd0VcdU="; nativeBuildInputs = [ pkg-config From 438d05615d2f9d7464cdfc378f0a590ec4e5e2b9 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 11 Aug 2023 20:58:50 +0000 Subject: [PATCH 27/88] certdump: fixup review comments Signed-off-by: Arthur Gautier --- pkgs/tools/security/{CertDump => certdump}/default.nix | 4 +--- pkgs/tools/security/{CertDump => certdump}/deps.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/tools/security/{CertDump => certdump}/default.nix (93%) rename pkgs/tools/security/{CertDump => certdump}/deps.nix (100%) diff --git a/pkgs/tools/security/CertDump/default.nix b/pkgs/tools/security/certdump/default.nix similarity index 93% rename from pkgs/tools/security/CertDump/default.nix rename to pkgs/tools/security/certdump/default.nix index a8850a85233..7b5b6744b34 100644 --- a/pkgs/tools/security/CertDump/default.nix +++ b/pkgs/tools/security/certdump/default.nix @@ -6,8 +6,7 @@ }: buildDotnetModule rec { - pname = "CertDump"; - + pname = "certdump"; version = "unstable-2023-07-12"; src = fetchFromGitHub { @@ -40,6 +39,5 @@ buildDotnetModule rec { ''; license = licenses.asl20; maintainers = [ maintainers.baloo ]; - platforms = with platforms; (linux ++ darwin); }; } diff --git a/pkgs/tools/security/CertDump/deps.nix b/pkgs/tools/security/certdump/deps.nix similarity index 100% rename from pkgs/tools/security/CertDump/deps.nix rename to pkgs/tools/security/certdump/deps.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674ad274628..2649c072c93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6956,7 +6956,7 @@ with pkgs; code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; - CertDump = callPackage ../tools/security/CertDump { }; + certdump = callPackage ../tools/security/certdump { }; certstrap = callPackage ../tools/security/certstrap { }; From 59e66c1c5581d4a15eb7a2ff442af18c61a475ff Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 11 Aug 2023 18:26:46 -0700 Subject: [PATCH 28/88] cc2538-bsl: clean up dependencies and enable tests --- pkgs/tools/misc/cc2538-bsl/default.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/tools/misc/cc2538-bsl/default.nix index 77280835fe0..b09aaa9c3b3 100644 --- a/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/pkgs/tools/misc/cc2538-bsl/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; version = "unstable-2022-08-03"; + format = "setuptools"; src = fetchFromGitHub rec { owner = "JelmerT"; @@ -11,7 +12,20 @@ python3Packages.buildPythonPackage rec { hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; }; - nativeBuildInputs = [ python3Packages.setuptools-scm ]; + patches = [ + # https://github.com/JelmerT/cc2538-bsl/pull/138 + (fetchpatch { + name = "clean-up-install-dependencies.patch"; + url = "https://github.com/JelmerT/cc2538-bsl/commit/bf842adf8e99a9eb8528579e5b85e59ee23be08d.patch"; + hash = "sha256-XKQ0kfl8yFrSF5RosHY9OvJR18Fh0dmAN1FlfZ024ME="; + }) + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev0+g${lib.substring 0 7 src.rev}"; + + nativeBuildInputs = with python3Packages; [ + setuptools-scm + ]; propagatedBuildInputs = with python3Packages; [ intelhex @@ -19,7 +33,10 @@ python3Packages.buildPythonPackage rec { python-magic ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev0+g${lib.substring 0 7 src.rev}"; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + scripttest + ]; postInstall = '' # Remove .py from binary From bd8da4bbea99f37d2b13064dc88d9063dc78ff17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 12 Aug 2023 04:58:49 +0200 Subject: [PATCH 29/88] xclip: set meta.mainProgram --- pkgs/tools/misc/xclip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 6c5857f1c9a..721d300a19e 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/astrand/xclip"; license = lib.licenses.gpl2; platforms = lib.platforms.all; + mainProgram = "xclip"; }; } From 042229fd0b93a5329855ad4e166b8176bcdf9e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 12 Aug 2023 04:59:41 +0200 Subject: [PATCH 30/88] qrencode: set meta.mainProgram --- pkgs/development/libraries/qrencode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 14a9b9904d9..a0e23813ade 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ adolfogc yana ]; platforms = platforms.all; + mainProgram = "qrencode"; }; } From d4c64dcde97076bdedc8762325d118bae25a7a7d Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 12 Aug 2023 09:25:08 +0200 Subject: [PATCH 31/88] dnscrypt-proxy2: 2.1.4 -> 2.1.5 --- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 5457cf4ab53..24c6f7f2d31 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.4"; + version = "2.1.5"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-98DeCrDp0TmPCSvOrJ7KgIQZBR2K1fFJrmNccZ7nSug="; + sha256 = "sha256-A9Cu4wcJxrptd9CpgXw4eyMX2nmNAogYBRDeeAjpEZY="; }; meta = with lib; { From 35ceefe4b304796eb46d64ee43a634846f13e721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 08:40:38 +0000 Subject: [PATCH 32/88] mmv: 2.5 -> 2.5.1 --- pkgs/tools/misc/mmv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 253c0df9376..b396de5002d 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-tQk3AwmUuhbxvFm9wiO7BM2GChGopvpCZAp8J9XCDF0="; + sha256 = "sha256-01MJjYVPfDaRkzitqKXTJZHbkkZTEaFoyYZEEMizHp0="; fetchSubmodules = true; }; From 3757f23d4a5a7ec593f5d102d91f447b51d42f20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 11:18:57 +0000 Subject: [PATCH 33/88] rke: 1.4.7 -> 1.4.8 --- pkgs/applications/networking/cluster/rke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 6efdc1d5c44..38bdff136ac 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-XiFXFd9pZBrZdYggVoHhxdu4cH+IyDtDNr7ztM+Zskk="; + hash = "sha256-tc3XZyn1jdjkxWXG6qjsE2udpoq+RhhIWHXGmUQyO0Y="; }; vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk="; From 0660ea28dae1b67d9203630ac82c7e1c51b33e7e Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 12 Aug 2023 14:06:12 +0200 Subject: [PATCH 34/88] grafana-loki,promtail: 2.8.3 -> 2.8.4 https://github.com/grafana/loki/releases/tag/v2.8.4 diff: https://github.com/grafana/loki/compare/v2.8.3...v2.8.4 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index b47603c66d8..407aa5fc5f7 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.8.3"; + version = "2.8.4"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-Ceuxaxl4KHOlS51MbpYYox6r/SfbGcLrmKbst+xQk74="; + hash = "sha256-imMtVjDOkm+cFjyKbP/QNUTYLoLo8TbDQroT0fvbe10="; }; vendorHash = null; From 8b3e6a2746d342eb20ed7800b6d51a97ade47ed1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 12:50:24 +0000 Subject: [PATCH 35/88] krelay: 0.0.4 -> 0.0.5 --- pkgs/applications/networking/cluster/krelay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index 51c99b36e5a..38c6dcc32b8 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krelay"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NAIRzHWXD4z6lpwi+nVVoCIzfWdaMdrWwht24KgQh3c="; + sha256 = "sha256-TC+1y0RNBobHr1BsvZdmOM58N2CIBeA7pQoWRj1SXCw="; }; - vendorSha256 = "sha256-1/zy5gz1wvinwzRjjhvrIHdjO/Jy/ragqM5QQaAajXI="; + vendorHash = "sha256-yW6Uephj+cpaMO8LMOv3I02nvooscACB9N2vq1qrXwY="; subPackages = [ "cmd/client" ]; From 9e3622c85fb6877d83ecf6ccc591f7d52701aa1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 13:12:31 +0000 Subject: [PATCH 36/88] vals: 0.26.1 -> 0.26.2 --- pkgs/tools/security/vals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 0e86d644c82..489d0e6d93f 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vals"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-gICEqwt34pllvxA8JVc0rCQ2F3w6wT96eKTTxE0j398="; + sha256 = "sha256-WTUdb2LF/50KT3BqwbvKu4TFocbYBdEAoD3IQiPD2bs="; }; vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs="; From 32f6cfaae59ad1d1cb1338023015cb6e31c4b2d2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 12 Aug 2023 11:32:02 -0400 Subject: [PATCH 37/88] pluginupdate: don't rely on NIX_PATH Nix does not respect `NIX_PATH` when the `nix-path` setting in nix.conf is set --- maintainers/scripts/pluginupdate.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 7c6cfd4fed7..f9ec19bed4a 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -315,9 +315,10 @@ def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[Plugin return plugins def run_nix_expr(expr): - with CleanEnvironment(): + with CleanEnvironment() as nix_path: cmd = ["nix", "eval", "--extra-experimental-features", - "nix-command", "--impure", "--json", "--expr", expr] + "nix-command", "--impure", "--json", "--expr", expr, + "--nix-path", nix_path] log.debug("Running command %s", " ".join(cmd)) out = subprocess.check_output(cmd) data = json.loads(out) @@ -521,14 +522,14 @@ class Editor: class CleanEnvironment(object): - def __enter__(self) -> None: + def __enter__(self) -> str: self.old_environ = os.environ.copy() local_pkgs = str(Path(__file__).parent.parent.parent) - os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}" self.empty_config = NamedTemporaryFile() self.empty_config.write(b"{}") self.empty_config.flush() os.environ["NIXPKGS_CONFIG"] = self.empty_config.name + return f"localpkgs={local_pkgs}" def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: os.environ.update(self.old_environ) From 90c4482d07a5ef3552c18d43c40381262e0f8c69 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 12 Aug 2023 11:41:04 -0400 Subject: [PATCH 38/88] pluginupdate.py: format with black, fix comments --- maintainers/scripts/pluginupdate.py | 178 ++++++++++++++++------------ 1 file changed, 103 insertions(+), 75 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index f9ec19bed4a..6a607eb6248 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -4,20 +4,20 @@ # - maintainers/scripts/update-luarocks-packages # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#black maintainers/scripts/pluginupdate.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py +# $ nix run nixpkgs#python3.pkgs.flake8 -- --ignore E501,E265 maintainers/scripts/pluginupdate.py import argparse import csv import functools import http import json +import logging import os import subprocess -import logging import sys import time import traceback @@ -25,14 +25,14 @@ import urllib.error import urllib.parse import urllib.request import xml.etree.ElementTree as ET +from dataclasses import asdict, dataclass from datetime import datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union, Any, Callable -from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile -from dataclasses import dataclass, asdict +from typing import Any, Callable, Dict, List, Optional, Tuple, Union +from urllib.parse import urljoin, urlparse import git @@ -41,12 +41,13 @@ ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " LOG_LEVELS = { - logging.getLevelName(level): level for level in [ - logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] + logging.getLevelName(level): level + for level in [logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR] } log = logging.getLogger() + def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ @@ -77,6 +78,7 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa return deco_retry + @dataclass class FetchConfig: proc: int @@ -91,22 +93,21 @@ def make_request(url: str, token=None) -> urllib.request.Request: # a dictionary of plugins and their new repositories -Redirects = Dict['PluginDesc', 'Repo'] +Redirects = Dict["PluginDesc", "Repo"] + class Repo: - def __init__( - self, uri: str, branch: str - ) -> None: + def __init__(self, uri: str, branch: str) -> None: self.uri = uri - '''Url to the repo''' + """Url to the repo""" self._branch = branch # Redirect is the new Repo to use - self.redirect: Optional['Repo'] = None + self.redirect: Optional["Repo"] = None self.token = "dummy_token" @property def name(self): - return self.uri.split('/')[-1] + return self.uri.split("/")[-1] @property def branch(self): @@ -114,6 +115,7 @@ class Repo: def __str__(self) -> str: return f"{self.uri}" + def __repr__(self) -> str: return f"Repo({self.name}, {self.uri})" @@ -125,9 +127,9 @@ class Repo: def latest_commit(self) -> Tuple[str, datetime]: log.debug("Latest commit") loaded = self._prefetch(None) - updated = datetime.strptime(loaded['date'], "%Y-%m-%dT%H:%M:%S%z") + updated = datetime.strptime(loaded["date"], "%Y-%m-%dT%H:%M:%S%z") - return loaded['rev'], updated + return loaded["rev"], updated def _prefetch(self, ref: Optional[str]): cmd = ["nix-prefetch-git", "--quiet", "--fetch-submodules", self.uri] @@ -144,23 +146,23 @@ class Repo: return loaded["sha256"] def as_nix(self, plugin: "Plugin") -> str: - return f'''fetchgit {{ + return f"""fetchgit {{ url = "{self.uri}"; rev = "{plugin.commit}"; sha256 = "{plugin.sha256}"; - }}''' + }}""" class RepoGitHub(Repo): - def __init__( - self, owner: str, repo: str, branch: str - ) -> None: + def __init__(self, owner: str, repo: str, branch: str) -> None: self.owner = owner self.repo = repo self.token = None - '''Url to the repo''' + """Url to the repo""" super().__init__(self.url(""), branch) - log.debug("Instantiating github repo owner=%s and repo=%s", self.owner, self.repo) + log.debug( + "Instantiating github repo owner=%s and repo=%s", self.owner, self.repo + ) @property def name(self): @@ -213,7 +215,6 @@ class RepoGitHub(Repo): new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch) self.redirect = new_repo - def prefetch(self, commit: str) -> str: if self.has_submodules(): sha256 = super().prefetch(commit) @@ -233,12 +234,12 @@ class RepoGitHub(Repo): else: submodule_attr = "" - return f'''fetchFromGitHub {{ + return f"""fetchFromGitHub {{ owner = "{self.owner}"; repo = "{self.repo}"; rev = "{plugin.commit}"; sha256 = "{plugin.sha256}";{submodule_attr} - }}''' + }}""" @dataclass(frozen=True) @@ -258,15 +259,14 @@ class PluginDesc: return self.repo.name < other.repo.name @staticmethod - def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> 'PluginDesc': + def load_from_csv(config: FetchConfig, row: Dict[str, str]) -> "PluginDesc": branch = row["branch"] - repo = make_repo(row['repo'], branch.strip()) + repo = make_repo(row["repo"], branch.strip()) repo.token = config.github_token return PluginDesc(repo, branch.strip(), row["alias"]) - @staticmethod - def load_from_string(config: FetchConfig, line: str) -> 'PluginDesc': + def load_from_string(config: FetchConfig, line: str) -> "PluginDesc": branch = "HEAD" alias = None uri = line @@ -279,6 +279,7 @@ class PluginDesc: repo.token = config.github_token return PluginDesc(repo, branch.strip(), alias) + @dataclass class Plugin: name: str @@ -302,23 +303,38 @@ class Plugin: return copy -def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[PluginDesc]: +def load_plugins_from_csv( + config: FetchConfig, + input_file: Path, +) -> List[PluginDesc]: log.debug("Load plugins from csv %s", input_file) plugins = [] - with open(input_file, newline='') as csvfile: + with open(input_file, newline="") as csvfile: log.debug("Writing into %s", input_file) - reader = csv.DictReader(csvfile,) + reader = csv.DictReader( + csvfile, + ) for line in reader: plugin = PluginDesc.load_from_csv(config, line) plugins.append(plugin) return plugins + def run_nix_expr(expr): with CleanEnvironment() as nix_path: - cmd = ["nix", "eval", "--extra-experimental-features", - "nix-command", "--impure", "--json", "--expr", expr, - "--nix-path", nix_path] + cmd = [ + "nix", + "eval", + "--extra-experimental-features", + "nix-command", + "--impure", + "--json", + "--expr", + expr, + "--nix-path", + nix_path, + ] log.debug("Running command %s", " ".join(cmd)) out = subprocess.check_output(cmd) data = json.loads(out) @@ -349,7 +365,7 @@ class Editor: self.nixpkgs_repo = None def add(self, args): - '''CSV spec''' + """CSV spec""" log.debug("called the 'add' command") fetch_config = FetchConfig(args.proc, args.github_token) editor = self @@ -357,23 +373,27 @@ class Editor: log.debug("using plugin_line", plugin_line) pdesc = PluginDesc.load_from_string(fetch_config, plugin_line) log.debug("loaded as pdesc", pdesc) - append = [ pdesc ] - editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append) - plugin, _ = prefetch_plugin(pdesc, ) + append = [pdesc] + editor.rewrite_input( + fetch_config, args.input_file, editor.deprecated, append=append + ) + plugin, _ = prefetch_plugin( + pdesc, + ) autocommit = not args.no_commit if autocommit: commit( editor.nixpkgs_repo, "{drv_name}: init at {version}".format( drv_name=editor.get_drv_name(plugin.normalized_name), - version=plugin.version + version=plugin.version, ), [args.outfile, args.input_file], ) # Expects arguments generated by 'update' subparser - def update(self, args ): - '''CSV spec''' + def update(self, args): + """CSV spec""" print("the update member function should be overriden in subclasses") def get_current_plugins(self) -> List[Plugin]: @@ -386,11 +406,11 @@ class Editor: return plugins def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]: - '''CSV spec''' + """CSV spec""" return load_plugins_from_csv(config, plugin_file) def generate_nix(self, _plugins, _outfile: str): - '''Returns nothing for now, writes directly to outfile''' + """Returns nothing for now, writes directly to outfile""" raise NotImplementedError() def get_update(self, input_file: str, outfile: str, config: FetchConfig): @@ -414,7 +434,6 @@ class Editor: return update - @property def attr_path(self): return self.name + "Plugins" @@ -428,10 +447,11 @@ class Editor: def create_parser(self): common = argparse.ArgumentParser( add_help=False, - description=(f""" + description=( + f""" Updates nix derivations for {self.name} plugins.\n By default from {self.default_in} to {self.default_out}""" - ) + ), ) common.add_argument( "--input-names", @@ -464,26 +484,33 @@ class Editor: Uses GITHUB_API_TOKEN environment variables as the default value.""", ) common.add_argument( - "--no-commit", "-n", action="store_true", default=False, - help="Whether to autocommit changes" + "--no-commit", + "-n", + action="store_true", + default=False, + help="Whether to autocommit changes", ) common.add_argument( - "--debug", "-d", choices=LOG_LEVELS.keys(), + "--debug", + "-d", + choices=LOG_LEVELS.keys(), default=logging.getLevelName(logging.WARN), - help="Adjust log level" + help="Adjust log level", ) main = argparse.ArgumentParser( parents=[common], - description=(f""" + description=( + f""" Updates nix derivations for {self.name} plugins.\n By default from {self.default_in} to {self.default_out}""" - ) + ), ) subparsers = main.add_subparsers(dest="command", required=False) padd = subparsers.add_parser( - "add", parents=[], + "add", + parents=[], description="Add new plugin", add_help=False, ) @@ -503,10 +530,12 @@ class Editor: pupdate.set_defaults(func=self.update) return main - def run(self,): - ''' + def run( + self, + ): + """ Convenience function - ''' + """ parser = self.create_parser() args = parser.parse_args() command = args.command or "update" @@ -519,8 +548,6 @@ class Editor: getattr(self, command)(args) - - class CleanEnvironment(object): def __enter__(self) -> str: self.old_environ = os.environ.copy() @@ -571,14 +598,15 @@ def print_download_error(plugin: PluginDesc, ex: Exception): ] print("\n".join(tb_lines)) + def check_results( results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]] ) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]: - ''' ''' + """ """ failures: List[Tuple[PluginDesc, Exception]] = [] plugins = [] redirects: Redirects = {} - for (pdesc, result, redirect) in results: + for pdesc, result, redirect in results: if isinstance(result, Exception): failures.append((pdesc, result)) else: @@ -595,17 +623,18 @@ def check_results( else: print(f", {len(failures)} plugin(s) could not be downloaded:\n") - for (plugin, exception) in failures: + for plugin, exception in failures: print_download_error(plugin, exception) sys.exit(1) + def make_repo(uri: str, branch) -> Repo: - '''Instantiate a Repo with the correct specialization depending on server (gitub spec)''' + """Instantiate a Repo with the correct specialization depending on server (gitub spec)""" # dumb check to see if it's of the form owner/repo (=> github) or https://... res = urlparse(uri) - if res.netloc in [ "github.com", ""]: - res = res.path.strip('/').split('/') + if res.netloc in ["github.com", ""]: + res = res.path.strip("/").split("/") repo = RepoGitHub(res[0], res[1], branch) else: repo = Repo(uri.strip(), branch) @@ -676,7 +705,6 @@ def prefetch( return (pluginDesc, e, None) - def rewrite_input( config: FetchConfig, input_file: Path, @@ -685,12 +713,14 @@ def rewrite_input( redirects: Redirects = {}, append: List[PluginDesc] = [], ): - plugins = load_plugins_from_csv(config, input_file,) + plugins = load_plugins_from_csv( + config, + input_file, + ) plugins.extend(append) if redirects: - cur_date_iso = datetime.now().strftime("%Y-%m-%d") with open(deprecated, "r") as f: deprecations = json.load(f) @@ -710,8 +740,8 @@ def rewrite_input( with open(input_file, "w") as f: log.debug("Writing into %s", input_file) # fields = dataclasses.fields(PluginDesc) - fieldnames = ['repo', 'branch', 'alias'] - writer = csv.DictWriter(f, fieldnames, dialect='unix', quoting=csv.QUOTE_NONE) + fieldnames = ["repo", "branch", "alias"] + writer = csv.DictWriter(f, fieldnames, dialect="unix", quoting=csv.QUOTE_NONE) writer.writeheader() for plugin in sorted(plugins): writer.writerow(asdict(plugin)) @@ -727,7 +757,6 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: print("no changes in working tree to commit") - def update_plugins(editor: Editor, args): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" @@ -752,4 +781,3 @@ def update_plugins(editor: Editor, args): f"{editor.attr_path}: resolve github repository redirects", [args.outfile, args.input_file, editor.deprecated], ) - From cd0bdcf92727bb9bceddbe16faa9f52307e162b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Aug 2023 17:51:12 +0200 Subject: [PATCH 39/88] python311Packages.python-roborock: 0.32.2 -> 0.32.3 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.32.2...v0.32.3 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.32.3/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index d00baf7fe5f..c300ce9baa5 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.32.2"; + version = "0.32.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-QMKdStv8WNGUjRrtU6ZKXsJPsYWMXbDMqWUO1nkD1Cc="; + hash = "sha256-rKE+dgq0ax/EZ0qYkGVsnHhNxyt3F74hI2tZAaOHCqI="; }; pythonRelaxDeps = [ From 5bdad1e51d3ff4e0e009a63b6ec00e2b001a1617 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 18:36:17 +0000 Subject: [PATCH 40/88] fnott: 1.4.0 -> 1.4.1 --- pkgs/applications/misc/fnott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 88ce5d71206..c46ce82ea3f 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A="; + sha256 = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; }; depsBuildBuild = [ From d77b3adfb570c678706a4301d97dde98d1f70469 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sat, 12 Aug 2023 15:00:39 -0400 Subject: [PATCH 41/88] python3Packages.streamdeck: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/streamdeck/default.nix | 4 ++-- .../python-modules/streamdeck/hardcode-libusb.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 19c8e9498ce..8354b840238 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - hash = "sha256-9bNWsNEW5Di2EZ3z+p8y4Q7GTfIG66b05pTiQcff7HE="; + hash = "sha256-aVmWbrBhZ49NfwOp23FD1dxZF+w/q26fIOVs7iQXUxo="; }; patches = [ diff --git a/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch b/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch index acef15b5405..a8b7e0083e5 100644 --- a/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch +++ b/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch @@ -5,7 +5,7 @@ index 824c59c..f13754e 100644 @@ -110,7 +110,7 @@ class LibUSBHIDAPI(Transport): search_library_names = { - "Windows": ["hidapi.dll", "libhidapi-0.dll"], + "Windows": ["hidapi.dll", "libhidapi-0.dll", "./hidapi.dll"], - "Linux": ["libhidapi-libusb.so", "libhidapi-libusb.so.0"], + "Linux": ["@libusb@"], "Darwin": ["libhidapi.dylib"], From ad35cfa138590d42cd2db28b5e0b59497f6480be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 19:35:18 +0000 Subject: [PATCH 42/88] ocenaudio: 3.12.4 -> 3.12.5 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 1529580416b..b0be671d9cd 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-B9mYFmb5wU3LtwMU2fubIhlVP0Zz1QNwciL5EY49P1I="; + sha256 = "sha256-+edswdSwuEiGpSNP7FW6xvZy/rH53KcSSGAFXSb0DIM="; }; nativeBuildInputs = [ From 016a90cd3732e6c7abe00dbb1c7d03d60119934e Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sun, 13 Aug 2023 02:53:03 +0700 Subject: [PATCH 43/88] dual-function-keys: add `mainProgram` --- .../tools/inputmethods/interception-tools/dual-function-keys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index f8caefa6087..34dde4dc742 100644 --- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ svend ]; platforms = platforms.linux; + mainProgram = "dual-function-keys"; }; } From ea9b076e9c9a63b82815c77d3aa0b418b0498c6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 20:38:12 +0000 Subject: [PATCH 44/88] google-guest-oslogin: 20230502.00 -> 20230808.00 --- pkgs/tools/virtualization/google-guest-oslogin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 84e6a865dcd..32ca1ed0035 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20230502.00"; + version = "20230808.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-66e0d6nE3880xsdI67O71TyZKQi3sGHkx7fLo3xVI7Q="; + sha256 = "sha256-6CHMnoPrfXFAgTyIoGPsMos9CaW6W0zcbpIG1j7DRqk="; }; postPatch = '' From ffe22348eb72fe53825cdb486505450bc45a33ee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Aug 2023 21:59:12 +0100 Subject: [PATCH 45/88] fmt: 10.0.0 -> 10.1.0 Among other things this pulls upstream fix for glibc-2.38: https://github.com/fmtlib/fmt/commit/e4758590420565c1a4865913615d0feabae6654c Without the change `pkgsi686Linux.fmt` fails tests against `glibc-2.38` as: /build/source/test/chrono-test.cc:733: Failure Expected equality of these values: "44.000000000000" fmt::format("{:%S}", std::chrono::duration( 1.54213895E+26)) --- pkgs/development/libraries/fmt/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4c439717bac..0796febe4ae 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -67,14 +67,7 @@ in }; fmt_10 = generic { - version = "10.0.0"; - sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; - patches = [ - # fixes a test failure on pkgsMusl.fmt - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff"; - hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g="; - }) - ]; + version = "10.1.0"; + sha256 = "sha256-t/Mcl3n2dj8UEnptQh4YgpvWrxSYN3iGPZ3LKwzlPAg="; }; } From 607f5c5835948319a1d170a5045743dcffc33c0c Mon Sep 17 00:00:00 2001 From: Samy Lahfa <14914796+AkechiShiro@users.noreply.github.com> Date: Wed, 9 Aug 2023 21:44:29 +0200 Subject: [PATCH 46/88] =?UTF-8?q?azure-cli:=202.50.0=20=E2=86=92=202.51.0?= =?UTF-8?q?=20https://github.com/MicrosoftDocs/azure-docs-cli/blob/main/do?= =?UTF-8?q?cs-ref-conceptual/release-notes-azure-cli.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add SourceProvenance and changelog * Fix typo on sourceTypes * Bump msal from 1.20.0 to 1.24.0b1 * Fix changelog link to latest file upstream instead of commit * Add meta.{mainProgram,platforms,longDescription,downloadPage} and update sha256 to sha512 --- pkgs/tools/admin/azure-cli/default.nix | 15 ++++++-- .../tools/admin/azure-cli/python-packages.nix | 34 +++++++++---------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 958a0fcd9e2..5d248547173 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }: let - version = "2.50.0"; + version = "2.51.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-eKE/jdS5/PshCxn/4NXuW5rHh7jBsv2VQSWM3cjLHRw="; + hash = "sha512-KjkR1YKvL5stfmIbrfzj9Ons4iYyiKQdLiRh7I7Dd43lvJwXaYLNjIYL5SOX3F3D9nmNxCb0qmYAQH0iEmyVjw=="; }; # put packages that needs to be overridden in the py package scope @@ -269,8 +269,19 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { meta = with lib; { homepage = "https://github.com/Azure/azure-cli"; description = "Next generation multi-platform command line experience for Azure"; + downloadPage = "https://github.com/Azure/azure-cli/releases/tag/azure-cli-${version}"; + longDescription = '' + The Azure Command-Line Interface (CLI) is a cross-platform + command-line tool to connect to Azure and execute administrative + commands on Azure resources. It allows the execution of commands + through a terminal using interactive command-line prompts or a script. + ''; + changelog = "https://github.com/MicrosoftDocs/azure-docs-cli/blob/main/docs-ref-conceptual/release-notes-azure-cli.md"; + sourceProvenance = [ sourceTypes.fromSource ]; license = licenses.mit; + mainProgram = "az"; maintainers = with maintainers; [ akechishiro jonringer ]; + platforms = platforms.all; }; }) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 303e0ffacc3..625d68dabc0 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -65,7 +65,7 @@ let --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" \ --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" \ - --replace "msal[broker]==1.22.0" "msal[broker]" \ + --replace "msal[broker]==1.24.0b1" "msal[broker]" \ --replace "packaging>=20.9,<22.0" "packaging" ''; nativeCheckInputs = with self; [ pytest ]; @@ -112,8 +112,8 @@ let antlr4 = super.pkgs.antlr4_9; }); - azure-batch = overrideAzureMgmtPackage super.azure-batch "13.0.0" "zip" - "sha256-6Sld5wQE0nbtoN0iU9djl0Oavl2PGMH8oZnEm41q4wo="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "14.0.0" "zip" + "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ="; azure-data-tables = overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip" "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; @@ -136,8 +136,8 @@ let azure-mgmt-extendedlocation = overrideAzureMgmtPackage super.azure-mgmt-extendedlocation "1.0.0b2" "zip" "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A="; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b2" "zip" - "sha256-e+I5MdbbX7WhxHCj1Ery3z2WUrJtpWGD1bhLbqReb58="; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b4" "zip" + "sha512-NW2BNj45lKzBmPXWMuBnVEDG2C6xzo9J/QjcC5fczvyhKBIkhugJVOWdPUsSzyGeQYKdqpRWPOl0yBG/eblHQA=="; azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b10" "zip" "sha256-sM8oZdhv+5WCd4RnMtEmCikTBmzGsap5heKzSbHbRPI="; @@ -151,11 +151,11 @@ let azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip" "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw="; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.3.0" "zip" - "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip" + "sha512-bUFY0+JipVihatMib0Giv7THnv4rRAbT36PhP+5tcsVlBVLmCYqjyp0iWnTfSbvRiljKOjbm3w+xeC0gL/IE7w=="; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.1.0" "zip" - "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.0.0" "zip" + "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk="; @@ -163,8 +163,8 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "24.0.0" "zip" - "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip" + "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; @@ -249,8 +249,8 @@ let azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip" "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "3.0.0" "zip" - "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "5.0.0" "zip" + "sha512-wMI55Ou96rzUEZIeTDmMfR4KIz3tG98z6A6teJanGPyNgte9tGa0/+2ge0yX10iwRKZyZZPNTReCkcd+IOkS+A=="; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip" "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; @@ -485,12 +485,12 @@ let }); msal = super.msal.overridePythonAttrs(oldAttrs: rec { - version = "1.20.0"; + version = "1.24.0b1"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; - hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; + hash = "sha256-ze5CqX+m8XH4NUECL2SgNT9EXV4wS/0DgO5XMDHo/Uo="; }; }); @@ -514,12 +514,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.10.1"; + version = "0.11.0"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; - hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; + hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ="; }; }); From c00beded45ae35670ac71cc6ebc5ac66093e5ca5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 12 Aug 2023 21:02:13 -0400 Subject: [PATCH 47/88] cargo-show-asm: 0.2.20 -> 0.2.21 Diff: https://diff.rs/cargo-show-asm/0.2.20/0.2.21 Changelog: https://github.com/pacak/cargo-show-asm/blob/0.2.21/Changelog.md --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 88107c0dbc6..37cc46a74e0 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.20"; + version = "0.2.21"; src = fetchCrate { inherit pname version; - hash = "sha256-uLF/xDRxw8sLWXkxxHa2cQ6MVMhcN5dop/qfWNEdyIE="; + hash = "sha256-0Fj+yC464XdqeMWBgBj5g6ZQGrurFM5LbqSe9GSgbGg="; }; - cargoHash = "sha256-HDHsTc7JKvLp5Ezaxctjlhd304TXdcVndkuiE9GBSZ0="; + cargoHash = "sha256-fW+WvsZv34ZpwaRCs6Uom7t0cV+9yPIlN5pbRea9YEk="; nativeBuildInputs = [ installShellFiles From 530835563fc9835b2e7c80b301b1fb5ca8c4991e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 13 Aug 2023 10:21:32 +0900 Subject: [PATCH 48/88] python310Packages.cwl-utils: 0.26 -> 0.28 Diff: https://github.com/common-workflow-language/cwl-utils/compare/refs/tags/v0.26...v0.28 Changelog: https://github.com/common-workflow-language/cwl-utils/releases/tag/v0.28 --- pkgs/development/python-modules/cwl-utils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index 96c331a9b59..3c80a158b4e 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, cachecontrol , cwl-upgrader , cwlformat , fetchFromGitHub @@ -11,12 +10,13 @@ , pythonOlder , rdflib , requests +, ruamel-yaml , schema-salad }: buildPythonPackage rec { pname = "cwl-utils"; - version = "0.26"; + version = "0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,15 +25,15 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T82zaXILbQFOIE0/HhNjpYutSdA1UeaxXO/M7Z4sSfo="; + hash = "sha256-hplpsig+phIX6WCbUV0ILcA62f5DE/yTyKfoaeumgyY="; }; propagatedBuildInputs = [ - cachecontrol cwl-upgrader packaging rdflib requests + ruamel-yaml schema-salad ]; @@ -55,6 +55,9 @@ buildPythonPackage rec { "test_graph_split" "test_caches_js_processes" "test_load_document_with_remote_uri" + # Don't run tests which require network access + "test_remote_packing" + "test_remote_packing_github_soft_links" ]; meta = with lib; { From 7cf1e12175612e83ef826d617a3489249ef0ec24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:18:10 +0000 Subject: [PATCH 49/88] mdbook-open-on-gh: 2.3.3 -> 2.4.1 --- pkgs/tools/text/mdbook-open-on-gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index 29c6e54ee5f..a570d680592 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.3.3"; + version = "2.4.1"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-K7SkfUxav/r8icrpdfnpFTSZdYV9qUEvYZ2dGSbaP0w="; + hash = "sha256-d+8/7lli6iyzAWHIi0ahwPBwGhXrQrCKQisD2+jPHQ0="; }; - cargoHash = "sha256-Uvg0h0s3xtv/bVjqWLldvM/R5HQ6yoHdnBXvpUp/E3A="; + cargoHash = "sha256-WbPYrjDMJEwle+Pev5nr9ZhnycbXUjdrx8XAqQ0OpaM="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; From d9a33d5c7de48c4bc0a3109c006912506f02c80e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:31:40 +0000 Subject: [PATCH 50/88] kubectl-gadget: 0.18.1 -> 0.19.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 9b284dd48e8..8ba0d50dd36 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-QB1OX5G0WkV8k84282+haQc2JVMUhsO99cpEMrHR9qY="; + hash = "sha256-5FbjD02HsMChaMMvTjsB/hzivO4s1H5tLK1QMIMlBCI="; }; - vendorHash = "sha256-5ydul1buJignI5KCn6TMYCjdJ6ni6NgYQrnrGBPADI4="; + vendorHash = "sha256-Beas+oXcK5i4ibE5EAa9+avYuax/kr3op1xbtMPJMas="; CGO_ENABLED = 0; From 797dd2b1d4ff3830223785a76fcd1fc9d16a308a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 03:03:18 +0000 Subject: [PATCH 51/88] crow-translate: 2.10.7 -> 2.10.10 --- pkgs/applications/misc/crow-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index a9c723d643a..77611e2da43 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.7"; + version = "2.10.10"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-OVRl9yQKK3hJgRVV/W4Fl3LxdFpJs01Mo3pwxLg2RXg="; + hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28="; }; patches = [ From f66c1b35dc906576ccb45689728784b48a77085f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 05:28:45 +0000 Subject: [PATCH 52/88] mdbook-katex: 0.5.6 -> 0.5.7 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index be83e0f9846..35f43ee4670 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.6"; + version = "0.5.7"; src = fetchCrate { inherit pname version; - hash = "sha256-aG7mXMDogGfAHwz+itJthl7sJ4o+Oz5RnrTHNstrh28="; + hash = "sha256-yOZTvCuxb2dqH06xgvS2+Vz9Vev0mI/ZEzdL8JPMu8s="; }; - cargoHash = "sha256-LE9NalzCTYvcj7WwQKVc7HkbyUj9zQIA2RfK8uxNfOk="; + cargoHash = "sha256-zjBPOEv8jCn48QbK512O3PfLLeozr8ZHkZcfRQSQnvY="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 33d5086eb38e053d56f7aaf7eb8f1a03301df32e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 06:01:01 +0000 Subject: [PATCH 53/88] cyclonedx-gomod: 1.4.0 -> 1.4.1 --- pkgs/tools/security/cyclonedx-gomod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 5385fd19c8a..1c404aa3f83 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-GCRLOfrL1jFExGb5DbJa8s7RQv8Wn81TGktShZqeC54="; + hash = "sha256-JczDfNBYT/Ap2lDucEvuT8NAwuQgmavOUvtznI6Q+Zc="; }; - vendorHash = "sha256-gFewqutvkFc/CVpBD3ORGcfiG5UNh5tQ1ElHpM3g5+I="; + vendorHash = "sha256-5Mn+f+oVwbn2qGaZct5+9f6tOBXfsB/I72yD7fHUrC8="; # Tests require network access and cyclonedx executable doCheck = false; From bb5c38d19082dcd73fafecdba464721975a1ba56 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 11 Aug 2023 19:11:26 +1000 Subject: [PATCH 54/88] paperless-ngx: 1.16.5 -> 1.17.0 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 0a372705ea0..407805a59d1 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -19,13 +19,13 @@ }: let - version = "1.16.5"; + version = "1.17.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-suwXFqq3QSdY0KzSpr6NKPwm6xtMBR8aP5VV3XTynqI="; + hash = "sha256-Zv+5DMviBGyc24R+qcAlvjko7wH+Gturvw5nzFJlIfk="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +51,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-rzIDivZTZZWt6kgLt8mstYmvv5TlC+O8O/g01+aLMHQ="; + npmDepsHash = "sha256-J8oUDvcJ0fawTv9L1B9hw8l47UZvOCj16jUF+83W8W8="; nativeBuildInputs = [ python3 From 65db78515ac94cf5e3f7376b2ca51ab1a57ca4bb Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 19 Jun 2023 22:23:29 +0200 Subject: [PATCH 55/88] prismlauncher: add flite for TTS support Signed-off-by: Sefa Eyeoglu --- pkgs/games/prismlauncher/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 63604ea1ff5..274547a59f2 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -14,9 +14,11 @@ , jdk8 , jdk17 , gamemode +, flite , msaClientID ? null , gamemodeSupport ? stdenv.isLinux +, textToSpeechSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] }: @@ -61,6 +63,7 @@ symlinkJoin { stdenv.cc.cc.lib ] ++ lib.optional gamemodeSupport gamemode.lib + ++ lib.optional textToSpeechSupport flite ++ additionalLibs; in From d60de69148a124c24616a012c62123f08a49503b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 19 Jun 2023 22:23:41 +0200 Subject: [PATCH 56/88] prismlauncher: add additionalPrograms parameter Signed-off-by: Sefa Eyeoglu --- pkgs/games/prismlauncher/wrapper.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 274547a59f2..f54630e8c05 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -21,6 +21,7 @@ , textToSpeechSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] +, additionalPrograms ? [ ] }: let prismlauncherFinal = prismlauncher-unwrapped.override { @@ -66,12 +67,17 @@ symlinkJoin { ++ lib.optional textToSpeechSupport flite ++ additionalLibs; + programs = [ + xorg.xrandr + ] + ++ additionalPrograms; + in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] ++ lib.optionals stdenv.isLinux [ "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" + "--prefix PATH : ${lib.makeBinPath programs}" ]; inherit (prismlauncherFinal) meta; From 921102518a1735a09294019532cc91895d843125 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 19 Jun 2023 22:25:32 +0200 Subject: [PATCH 57/88] prismlauncher: add mesa-demos to PATH Prism Launcher uses glxinfo to query GPU information. Signed-off-by: Sefa Eyeoglu --- pkgs/games/prismlauncher/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index f54630e8c05..7a56be53430 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -15,6 +15,7 @@ , jdk17 , gamemode , flite +, mesa-demos , msaClientID ? null , gamemodeSupport ? stdenv.isLinux @@ -69,6 +70,7 @@ symlinkJoin { programs = [ xorg.xrandr + mesa-demos # need glxinfo ] ++ additionalPrograms; From a1a757feb8fc69147cbd7deeea7107547d83bccc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 9 Aug 2023 20:32:50 +0200 Subject: [PATCH 58/88] prismlauncher: rename to programs/libs runtimePrograms/runtimeLibs Signed-off-by: Sefa Eyeoglu --- pkgs/games/prismlauncher/wrapper.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 7a56be53430..240deec4e2f 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -50,7 +50,7 @@ symlinkJoin { qtWrapperArgs = let - libs = (with xorg; [ + runtimeLibs = (with xorg; [ libX11 libXext libXcursor @@ -68,18 +68,18 @@ symlinkJoin { ++ lib.optional textToSpeechSupport flite ++ additionalLibs; - programs = [ + runtimePrograms = [ xorg.xrandr - mesa-demos # need glxinfo + mesa-demos # need glxinfo ] ++ additionalPrograms; in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] ++ lib.optionals stdenv.isLinux [ - "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}" + "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - "--prefix PATH : ${lib.makeBinPath programs}" + "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; inherit (prismlauncherFinal) meta; From f9aca0219c14db236d193674e5f9dfe736d3139f Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 2 Aug 2023 00:38:16 +0000 Subject: [PATCH 59/88] iio-sensor-proxy: support cross compilation --- pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 05fd82401a2..3da9396d618 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, glib , cmake , libxml2 , meson @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson cmake + glib libxml2 ninja pkg-config From 4984853a829defd337f2c1ecf9cf5a119564df4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 06:22:52 +0000 Subject: [PATCH 60/88] jpegoptim: 1.5.4 -> 1.5.5 --- pkgs/applications/graphics/jpegoptim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 71d8e8ddaf3..d8ec361600e 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cfPQTSINEdii/A2czAIxKDUw6RZOH4xZI7HnUmKuR9k="; + sha256 = "sha256-3p3kcUur1u09ROdKXG5H8eilu463Rzbn2yfYo5o6+KM="; }; # There are no checks, it seems. From 5b46c671ce9a1d72d1ae1b20b98525a654d56a5d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 13 Aug 2023 15:07:00 +0800 Subject: [PATCH 61/88] xclip: remove duplicate meta.mainProgram Partial revert of https://github.com/NixOS/nixpkgs/pull/248624 --- pkgs/tools/misc/xclip/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 2607cbf8561..721d300a19e 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; license = lib.licenses.gpl2; - mainProgram = "xclip"; platforms = lib.platforms.all; mainProgram = "xclip"; }; From 84d00f176e91be1ecdbedc076c55e24cb004792c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 10:39:21 +0200 Subject: [PATCH 62/88] exploitdb: 2023-08-11 -> 2023-08-12 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-08-11...2023-08-12 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index bb322ce4f32..c61b152a563 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-08-11"; + version = "2023-08-12"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Fv5vGPo9KZCNTllQhVHlGh496vdwpdTx1V0StaS9Flk="; + hash = "sha256-614RJCI3/7xV5CaeiJqH0G3Kxk3orSN+xePHgHZY4GM="; }; nativeBuildInputs = [ From 387551a45b17aa77f068c788a4125d0d4c03a57e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 10:41:13 +0200 Subject: [PATCH 63/88] python311Packages.tplink-omada-client: 1.3.2 -> 1.3.3 Changelog: https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv1.3.3 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 7c94713f694..4c8967a3880 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-AR0jCoYePll6pZA1Nw/lrH4AhFL6WmGQjzLlYJl7IsQ="; + hash = "sha256-Jo0p/28Hzokeq0SAdyWfkKzoscVkQj9kP3VnRlWjR8o="; }; nativeBuildInputs = [ From 750fc50bfd132a44972aa15bb21937ae26303bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 06:21:34 +0000 Subject: [PATCH 64/88] meilisearch: 1.2.0 -> 1.3.1 --- pkgs/servers/search/meilisearch/Cargo.lock | 1173 +++++++++---------- pkgs/servers/search/meilisearch/default.nix | 6 +- 2 files changed, 582 insertions(+), 597 deletions(-) diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index ff4981d119e..23cc7c29040 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -4,19 +4,19 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", - "log", "memchr", "pin-project-lite", "tokio", "tokio-util", + "tracing", ] [[package]] @@ -46,8 +46,8 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.8.3", - "base64 0.21.0", - "bitflags", + "base64 0.21.2", + "bitflags 1.3.2", "brotli", "bytes", "bytestring", @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" +checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" dependencies = [ "actix-rt", "actix-service", @@ -150,9 +150,9 @@ dependencies = [ "futures-core", "log", "pin-project-lite", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-util", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -247,14 +247,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] @@ -282,9 +281,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -312,53 +311,71 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" dependencies = [ "backtrace", ] +[[package]] +name = "arbitrary" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "assert-json-diff" version = "2.0.2" @@ -388,7 +405,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] @@ -399,7 +416,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] @@ -411,17 +428,6 @@ dependencies = [ "critical-section", ] -[[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" @@ -438,8 +444,8 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", - "object 0.30.2", + "miniz_oxide 0.6.2", + "object", "rustc-demangle", ] @@ -451,19 +457,19 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.2.0" +version = "1.3.1" dependencies = [ "anyhow", "bytes", @@ -504,18 +510,18 @@ dependencies = [ "serde", ] -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.10.4" @@ -548,9 +554,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -560,9 +566,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-unit" @@ -597,7 +603,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] @@ -614,9 +620,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bytestring" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1" +checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" dependencies = [ "bytes", ] @@ -694,33 +700,35 @@ dependencies = [ [[package]] name = "charabia" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413155d93157bff9130895c3bd83970ac7f35659ca57226a96aa35cf1e8e102c" +checksum = "57aa1b4a8dda126c03ebf2f7e31d16cfc8781c2fe80dedd1a33459efc3e07578" dependencies = [ + "aho-corasick", "cow-utils", "csv", "deunicode", - "finl_unicode", + "either", "fst", "irg-kvariants", "jieba-rs", - "lindera", + "lindera-core", + "lindera-dictionary", + "lindera-tokenizer", "once_cell", "pinyin", "serde", "slice-group-by", "unicode-normalization", - "unicode-segmentation", "wana_kana", "whatlang", ] [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -729,15 +737,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -745,30 +753,19 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -777,43 +774,40 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", + "bitflags 1.3.2", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "clap_lex" -version = "0.4.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concat-arrays" @@ -826,31 +820,16 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -905,9 +884,9 @@ checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -923,19 +902,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.23", + "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -1042,9 +1021,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -1096,6 +1075,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -1177,9 +1167,9 @@ checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -1209,7 +1199,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.2.0" +version = "1.3.1" dependencies = [ "anyhow", "big_s", @@ -1229,7 +1219,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] @@ -1331,22 +1321,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", ] [[package]] @@ -1363,15 +1353,10 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.2.8" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1428,55 +1413,48 @@ dependencies = [ [[package]] name = "file-store" -version = "1.2.0" +version = "1.3.1" dependencies = [ "faux", "tempfile", "thiserror", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", "redox_syscall 0.2.16", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "filter-parser" -version = "1.2.0" +version = "1.3.1" dependencies = [ "insta", "nom", "nom_locate", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "libz-sys", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] name = "flatten-serde-json" -version = "1.2.0" +version = "1.3.1" dependencies = [ "criterion", "serde_json", @@ -1559,7 +1537,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] @@ -1593,47 +1571,16 @@ dependencies = [ ] [[package]] -name = "fuzzcheck" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee76e8096c3fcd82ab23177edddcc9b81b72c123caab54bb1e2dc19fd09d2dec" +name = "fuzzers" +version = "1.3.1" dependencies = [ - "ahash 0.7.6", - "bit-vec", - "cc", - "cfg-if", + "arbitrary", + "clap", "fastrand", - "flate2", - "fuzzcheck_common", - "fuzzcheck_mutators_derive", - "getopts", - "libc", - "md5", - "nu-ansi-term", - "object 0.27.1", - "regex-syntax", + "milli", "serde", "serde_json", -] - -[[package]] -name = "fuzzcheck_common" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde06f8d25b14a35d43eb2d3dbace3b9193424460b10ad4ccf1b3d542d48f06f" -dependencies = [ - "getopts", -] - -[[package]] -name = "fuzzcheck_mutators_derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ce01e8bbb3e7e0758dcf907fe799f5998a54368963f766ae94b84624ba60c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "tempfile", ] [[package]] @@ -1661,20 +1608,11 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -1695,9 +1633,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "git2" @@ -1705,7 +1643,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -1731,9 +1669,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1741,7 +1679,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1772,6 +1710,12 @@ dependencies = [ "ahash 0.7.6", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heapless" version = "0.7.16" @@ -1793,8 +1737,8 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heed" -version = "0.12.5" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.6#8c5b94225fc949c02bb7b900cc50ffaf6b584b1e" +version = "0.12.7" +source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" dependencies = [ "byteorder", "heed-traits", @@ -1811,12 +1755,12 @@ dependencies = [ [[package]] name = "heed-traits" version = "0.7.0" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.6#8c5b94225fc949c02bb7b900cc50ffaf6b584b1e" +source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" [[package]] name = "heed-types" version = "0.7.2" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.6#8c5b94225fc949c02bb7b900cc50ffaf6b584b1e" +source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" dependencies = [ "bincode", "heed-traits", @@ -1825,15 +1769,6 @@ dependencies = [ "zerocopy", ] -[[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.2.6" @@ -1906,9 +1841,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1930,15 +1865,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls", + "rustls 0.21.1", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", ] [[package]] @@ -1959,7 +1894,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.2.0" +version = "1.3.1" dependencies = [ "anyhow", "big_s", @@ -1984,7 +1919,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] @@ -1994,10 +1929,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "insta" version = "1.29.0" @@ -2024,10 +1978,25 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.10" +name = "instant-distance" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "8c619cdaa30bb84088963968bee12a45ea5fbbf355f2c021bcd15589f5ca494a" +dependencies = [ + "num_cpus", + "ordered-float", + "parking_lot", + "rand", + "rayon", + "serde", + "serde-big-array", +] + +[[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.1", "libc", @@ -2053,13 +2022,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.11", + "rustix 0.38.2", "windows-sys 0.48.0", ] @@ -2086,7 +2054,7 @@ checksum = "37228e06c75842d1097432d94d02f37fe3ebfca9791c2e8fef6e9db17ed128c1" dependencies = [ "cedarwood", "fxhash", - "hashbrown", + "hashbrown 0.12.3", "lazy_static", "phf", "phf_codegen", @@ -2104,16 +2072,16 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-depth-checker" -version = "1.2.0" +version = "1.3.1" dependencies = [ "criterion", "serde_json", @@ -2125,7 +2093,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "pem", "ring", "serde", @@ -2133,15 +2101,6 @@ dependencies = [ "simple_asn1", ] -[[package]] -name = "kanaria" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f9d9652540055ac4fded998a73aca97d965899077ab1212587437da44196ff" -dependencies = [ - "bitflags", -] - [[package]] name = "language-tags" version = "0.3.2" @@ -2165,9 +2124,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" @@ -2183,15 +2142,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -2199,9 +2158,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -2209,38 +2168,11 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "lindera" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72be283281bec2768687b1784be03a678609b51f2f90f6f9d9b4f07953e6dd25" -dependencies = [ - "anyhow", - "bincode", - "byteorder", - "encoding", - "kanaria", - "lindera-cc-cedict-builder", - "lindera-core", - "lindera-dictionary", - "lindera-filter", - "lindera-ipadic-builder", - "lindera-ko-dic-builder", - "lindera-unidic-builder", - "regex", - "serde", - "serde_json", - "thiserror", - "unicode-blocks", - "unicode-normalization", - "yada", -] - [[package]] name = "lindera-cc-cedict-builder" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10fbafd37adab44ccc2668a40fba2dbc4e665cb3c36018c15dfe2e2b830e28ce" +checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" dependencies = [ "anyhow", "bincode", @@ -2257,9 +2189,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9196bf5995503f6878a090dfee6114ba86430c72f67ef3624246b564869937" +checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" dependencies = [ "anyhow", "flate2", @@ -2268,9 +2200,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f0baa9932f682e9c5b388897330f155d3c40de80016e60125897fde5e0e246" +checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" dependencies = [ "anyhow", "bincode", @@ -2285,9 +2217,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e63fa6ef0bc3ce2c26d372aa6185b7a316194494a84f81678f5da2893bf4a2" +checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" dependencies = [ "anyhow", "flate2", @@ -2296,63 +2228,50 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd765c36166016de87a1f447ea971573e4c63e334836c46ad0020f0408c88bfc" +checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" dependencies = [ "anyhow", "bincode", "byteorder", + "lindera-cc-cedict-builder", "lindera-core", - "lindera-ipadic", - "lindera-ko-dic", - "serde", -] - -[[package]] -name = "lindera-filter" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5345e37fb9521ab3cee19283bed135d46b3521dc1fd13a49fa0992379056203" -dependencies = [ - "anyhow", - "bincode", - "byteorder", - "kanaria", - "lindera-core", - "lindera-dictionary", - "once_cell", - "regex", - "serde", - "serde_json", - "unicode-blocks", - "unicode-normalization", - "unicode-segmentation", - "yada", -] - -[[package]] -name = "lindera-ipadic" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60eeb356295f784e7db4cfd2c6772f2bd059e565a7744e246642a07bc333a88a" -dependencies = [ - "bincode", - "byteorder", - "encoding", - "flate2", - "lindera-core", - "lindera-decompress", "lindera-ipadic-builder", - "once_cell", - "tar", + "lindera-ipadic-neologd-builder", + "lindera-ko-dic", + "lindera-ko-dic-builder", + "lindera-unidic", + "lindera-unidic-builder", + "serde", ] [[package]] name = "lindera-ipadic-builder" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a16a2a88db9d956f5086bc976deb9951ca2dbbfef41a002df0a7bfb2c845aab" +checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "serde", + "yada", +] + +[[package]] +name = "lindera-ipadic-neologd-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" dependencies = [ "anyhow", "bincode", @@ -2362,7 +2281,6 @@ dependencies = [ "encoding_rs_io", "env_logger", "glob", - "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2372,9 +2290,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb479b170a841b8cfbe602d772e30849ffe0562b219190a378368968b8c8f66" +checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" dependencies = [ "bincode", "byteorder", @@ -2389,9 +2307,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9b58213552560717c48e7833444a20d2d7fe26a6e565f7ce0cbbf85784c7cf" +checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" dependencies = [ "anyhow", "bincode", @@ -2408,10 +2326,42 @@ dependencies = [ ] [[package]] -name = "lindera-unidic-builder" -version = "0.23.0" +name = "lindera-tokenizer" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6858147cdaf4a7b564c08a247449d3aca38e9b4812499651af08afbf85324596" +checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-dictionary", + "once_cell", + "serde", + "serde_json", +] + +[[package]] +name = "lindera-unidic" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "lindera-core", + "lindera-decompress", + "lindera-unidic-builder", + "once_cell", + "ureq", + "zip", +] + +[[package]] +name = "lindera-unidic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" dependencies = [ "anyhow", "bincode", @@ -2420,6 +2370,7 @@ dependencies = [ "encoding", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2440,9 +2391,15 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lmdb-rkv-sys" @@ -2484,12 +2441,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "logging_timer" @@ -2515,14 +2469,14 @@ dependencies = [ [[package]] name = "manifest-dir-macros" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08150cf2bab1fc47c2196f4f41173a27fcd0f684165e5458c0046b53a472e2f" +checksum = "450e5ef583bc05177c4975b9ea907047091a9f62e74e81fcafb99dbffac51e7e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", ] [[package]] @@ -2539,7 +2493,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.2.0" +version = "1.3.1" dependencies = [ "insta", "md5", @@ -2548,7 +2502,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.2.0" +version = "1.3.1" dependencies = [ "actix-cors", "actix-http", @@ -2560,13 +2514,12 @@ dependencies = [ "assert-json-diff", "async-stream", "async-trait", - "atty", "brotli", "bstr", "byte-unit", "bytes", "cargo_toml", - "clap 4.2.1", + "clap", "crossbeam-channel", "deserr", "dump", @@ -2580,8 +2533,9 @@ dependencies = [ "hex", "http", "index-scheduler", - "indexmap", + "indexmap 1.9.3", "insta", + "is-terminal", "itertools", "jsonwebtoken", "lazy_static", @@ -2596,6 +2550,7 @@ dependencies = [ "num_cpus", "obkv", "once_cell", + "ordered-float", "parking_lot", "permissive-json-pointer", "pin-project-lite", @@ -2605,7 +2560,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "segment", "serde", @@ -2627,7 +2582,7 @@ dependencies = [ "tokio-stream", "toml", "urlencoding", - "uuid 1.3.1", + "uuid 1.3.3", "vergen", "walkdir", "yaup", @@ -2636,9 +2591,9 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.2.0" +version = "1.3.1" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "enum-iterator", "hmac", "maplit", @@ -2650,12 +2605,12 @@ dependencies = [ "sha2", "thiserror", "time", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] name = "meilisearch-types" -version = "1.2.0" +version = "1.3.1" dependencies = [ "actix-web", "anyhow", @@ -2680,7 +2635,7 @@ dependencies = [ "thiserror", "time", "tokio", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] @@ -2709,12 +2664,13 @@ dependencies = [ [[package]] name = "milli" -version = "1.2.0" +version = "1.3.1" dependencies = [ "big_s", "bimap", "bincode", "bstr", + "bytemuck", "byteorder", "charabia", "concat-arrays", @@ -2725,12 +2681,13 @@ dependencies = [ "filter-parser", "flatten-serde-json", "fst", - "fuzzcheck", "fxhash", "geoutils", "grenad", "heed", + "indexmap 1.9.3", "insta", + "instant-distance", "itertools", "json-depth-checker", "levenshtein_automata", @@ -2744,6 +2701,7 @@ dependencies = [ "once_cell", "ordered-float", "rand", + "rand_pcg", "rayon", "roaring", "rstar", @@ -2756,14 +2714,14 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.1", + "uuid 1.3.3", ] [[package]] name = "mimalloc" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] @@ -2800,15 +2758,24 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.6" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebffdb73fe72e917997fad08bdbf31ac50b0fa91cec93e69a0662e4264d454c" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2839,23 +2806,13 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] -[[package]] -name = "nu-ansi-term" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e62e2187cbceeafee9fb7b5e5e182623e0628ebf430a479df4487beb8f92fd7a" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -2899,18 +2856,9 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" -dependencies = [ - "memchr", -] - -[[package]] -name = "object" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] @@ -2923,9 +2871,9 @@ checksum = "f69e48cd7c8e5bb52a1da1287fdbfd877c32673176583ce664cd63b201aba385" [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -2933,33 +2881,15 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "ordered-float" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "page_size" version = "0.4.2" @@ -3049,9 +2979,9 @@ dependencies = [ [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -3064,7 +2994,7 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "permissive-json-pointer" -version = "1.2.0" +version = "1.3.1" dependencies = [ "big_s", "serde_json", @@ -3072,9 +3002,9 @@ dependencies = [ [[package]] name = "pest" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -3082,9 +3012,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -3092,22 +3022,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -3172,9 +3102,9 @@ checksum = "3bd12336e3afa34152e002f57df37a7056778daa59ea542b3473b87f5fb260c4" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platform-dirs" @@ -3245,9 +3175,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3258,11 +3188,11 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "hex", "lazy_static", - "rustix 0.36.11", + "rustix 0.36.14", ] [[package]] @@ -3290,9 +3220,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -3327,6 +3257,16 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_pcg" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" +dependencies = [ + "rand_core", + "serde", +] + [[package]] name = "rayon" version = "1.7.0" @@ -3355,7 +3295,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3364,7 +3304,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3380,9 +3320,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", @@ -3397,17 +3337,17 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -3424,19 +3364,19 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.1", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.22.6", "winreg", ] @@ -3487,9 +3427,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc_version" @@ -3502,12 +3442,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.36.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" dependencies = [ - "bitflags", - "errno 0.2.8", + "bitflags 1.3.2", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", @@ -3516,15 +3456,28 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", - "errno 0.3.1", + "bitflags 1.3.2", + "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.3.1", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] @@ -3540,13 +3493,35 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -3608,13 +3583,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +dependencies = [ + "serde", +] + [[package]] name = "serde-cs" version = "0.2.4" @@ -3626,22 +3610,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -3649,9 +3633,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -3745,9 +3729,9 @@ dependencies = [ [[package]] name = "slice-group-by" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallstr" @@ -3832,9 +3816,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3849,9 +3833,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.14" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -3907,9 +3891,9 @@ dependencies = [ [[package]] name = "temp-env" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95b343d943e5a0d2221fb73029e8040f3c91d6d06afec86c664682a361681" +checksum = "9547444bfe52cbd79515c6c8087d8ae6ca8d64d2d31a27746320f5cb81d1a15c" dependencies = [ "parking_lot", ] @@ -3923,7 +3907,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.11", + "rustix 0.37.19", "windows-sys 0.45.0", ] @@ -3936,37 +3920,31 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -3976,15 +3954,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -4016,9 +3994,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -4030,18 +4008,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.26", ] [[package]] @@ -4050,16 +4028,26 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] [[package]] -name = "tokio-stream" -version = "0.1.12" +name = "tokio-rustls" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -4068,9 +4056,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4082,9 +4070,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" dependencies = [ "serde", "serde_spanned", @@ -4094,20 +4082,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", "serde_spanned", "toml_datetime", @@ -4134,9 +4122,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -4174,17 +4162,11 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -[[package]] -name = "unicode-blocks" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de2be6bad6f56ce8373d377e611cbb2265de3a656138065609ce82e217aad70" - [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -4201,12 +4183,6 @@ 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 = "unicode-xid" version = "0.2.4" @@ -4219,6 +4195,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64 0.21.2", + "log", + "once_cell", + "rustls 0.21.1", + "rustls-webpki", + "url", + "webpki-roots 0.23.1", +] + [[package]] name = "url" version = "2.3.1" @@ -4259,9 +4250,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom", "serde", @@ -4334,9 +4325,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4344,24 +4335,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -4371,9 +4362,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4381,28 +4372,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -4427,13 +4418,22 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "whatlang" version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "once_cell", ] @@ -4468,21 +4468,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[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" @@ -4617,9 +4602,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -4690,9 +4675,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -4723,7 +4708,7 @@ version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ - "zstd-safe 6.0.4+zstd.1.5.4", + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -4738,9 +4723,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.4+zstd.1.5.4" +version = "6.0.5+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -4748,9 +4733,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 7c8d76d01ac..6dc77b86271 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -7,7 +7,7 @@ , nix-update-script }: -let version = "1.2.0"; +let version = "1.3.1"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-j+tz47dQFyKy51UAzFOc2YkAeYDUdsiteenC38cWrLI="; + hash = "sha256-jttT4qChoqwTnjjoW0Zc15ZieZN7KD1Us64Tk0eDG3Y="; }; cargoBuildFlags = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; - "heed-0.12.5" = "sha256-WOdpgc3sDNKBSYWB102xTxmY1SWljH9Q1+6xmj4Rb8Q="; + "heed-0.12.7" = "sha256-mthHMaTqmNae8gpe4ZnozABKBrgFQdn9KWCvIzJJ+u4="; "lmdb-rkv-sys-0.15.1" = "sha256-zLHTprwF7aa+2jaD7dGYmOZpJYFijMTb4I3ODflNUII="; "nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY="; }; From 7eb93b20cc84abc3c845c89d88c62e3aabf9fcc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 10:53:07 +0200 Subject: [PATCH 65/88] proxify: 0.0.11 -> 0.0.12 Diff: https://github.com/projectdiscovery/proxify/compare/refs/tags/v0.0.11...v0.0.12 Changelog: https://github.com/projectdiscovery/proxify/releases/tag/v0.0.12 --- pkgs/tools/networking/proxify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index 331d00cc2c5..19c9828ea84 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "refs/tags/v${version}"; - hash = "sha256-aoge1K1T4jgh8TFN8nFIjFehmz/o1UefbzEbV85dHTk="; + hash = "sha256-j2FuyoTCc9mcoI683xZkMCL6QXy0dGEheNaormlgUvY="; }; - vendorHash = "sha256-ingumSn4EDdw1Vgwm/ghQTsErqFVFZtjNfwfDwdJ/2s="; + vendorHash = "sha256-kPj3KBi8Mbsj4BW7Vf1w4mW8EN07FuqgFhAkkLCl8Bc="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; From 75fbacb4c1a59de121f46f77719a09c3f09aacb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 10:58:42 +0200 Subject: [PATCH 66/88] metasploit: 6.3.28 -> 6.3.29 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 44 +++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 50 ++++++++++----------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index c61a49d143b..38c5306226d 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.28" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.29" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index cd9a209ba38..723264fdd58 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: fa40647fa24c91f387b6d4b84bf818c90feb8fd9 - ref: refs/tags/6.3.28 + revision: 1f8710308cee679b61629e0050952ea37d647ff4 + ref: refs/tags/6.3.29 specs: - metasploit-framework (6.3.28) + metasploit-framework (6.3.29) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -103,25 +103,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.6) - actionview (= 7.0.6) - activesupport (= 7.0.6) + actionpack (7.0.7) + actionview (= 7.0.7) + activesupport (= 7.0.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.6) - activesupport (= 7.0.6) + actionview (7.0.7) + activesupport (= 7.0.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.6) - activesupport (= 7.0.6) - activerecord (7.0.6) - activemodel (= 7.0.6) - activesupport (= 7.0.6) - activesupport (7.0.6) + activemodel (7.0.7) + activesupport (= 7.0.7) + activerecord (7.0.7) + activemodel (= 7.0.7) + activesupport (= 7.0.7) + activesupport (7.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -132,13 +132,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.799.0) - aws-sdk-core (3.180.2) + aws-partitions (1.803.0) + aws-sdk-core (3.180.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.396.0) + aws-sdk-ec2 (1.397.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.32.0) @@ -150,7 +150,7 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.0) + aws-sdk-s3 (1.132.1) aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) @@ -186,7 +186,7 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.0) + faker (3.2.1) i18n (>= 1.8.11, < 2) faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) @@ -316,9 +316,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.6) - actionpack (= 7.0.6) - activesupport (= 7.0.6) + railties (7.0.7) + actionpack (= 7.0.7) + activesupport (= 7.0.7) method_source rake (>= 12.2) thor (~> 1.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index ee459dce6d9..9fe021e7be8 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.28"; + version = "6.3.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-g6oM2xjfARBaVJm5AqfrqhLpa3av/0ixql2+62iuG94="; + sha256 = "sha256-e5aM4pGNDkF8UDxgb8O+uTNOiUmudnbDUWsO/Ke1nV4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f1bf0a59b41..e08cdab6ca3 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; + sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; + sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; + sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; + sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; + sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; addressable = { groups = ["default"]; @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdqsz0f826w1lm1npn4qagggnjpg683vxxvyfvc37pn07zmjbhf"; + sha256 = "0iz9n7yl9w5570f03nxq27wk8crfvz3l63an9k87aglcnpkj5f9p"; type = "gem"; }; - version = "1.799.0"; + version = "1.803.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sxkpg1mvg1aiqd2kp5h438qd5rjpgpx3ag0r5xsbzmij9ja3cj4"; + sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; type = "gem"; }; - version = "3.180.2"; + version = "3.180.3"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mcilr3qnj6pzwvv4qgdqcnpg5s1cj57b5k5gjl4bfvfyiq7x6z"; + sha256 = "08ypqmikkbnp3aa2sy8p80pigjlvjpgygj86gxm3hwr68s033a2d"; type = "gem"; }; - version = "1.396.0"; + version = "1.397.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cjb40w8hw4h59bbjidp6hlb1j6akb36d8s5a37vlm6zwq327i7f"; + sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; type = "gem"; }; - version = "1.132.0"; + version = "1.132.1"; }; aws-sdk-ssm = { groups = ["default"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3l58jrcapkp70v3swr0x4s6bj1101920al50wsaaj9dv0vhvm7"; + sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; faraday = { groups = ["default"]; @@ -644,12 +644,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "fa40647fa24c91f387b6d4b84bf818c90feb8fd9"; - sha256 = "1phvmrlfpgjxmaqlizxgfrmyj4maxfkh5fcraid100fz33dhral3"; + rev = "1f8710308cee679b61629e0050952ea37d647ff4"; + sha256 = "0plxnnkzq3kba71pcxmf964lwcxrpv1nyq1wa1y423ldj7i8r5kv"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.28"; + version = "6.3.29"; }; metasploit-model = { groups = ["default"]; @@ -1037,10 +1037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; + sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; rake = { groups = ["default"]; From b28fb7acb97b668ecbff88df75272ef06883d52d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:23:22 +0200 Subject: [PATCH 67/88] taskwarrior-tui: 0.23.7 -> 0.28.1 Signed-off-by: Matthias Beyer --- .../misc/taskwarrior-tui/Cargo.lock | 1632 ----------------- .../misc/taskwarrior-tui/default.nix | 13 +- 2 files changed, 4 insertions(+), 1641 deletions(-) delete mode 100644 pkgs/applications/misc/taskwarrior-tui/Cargo.lock diff --git a/pkgs/applications/misc/taskwarrior-tui/Cargo.lock b/pkgs/applications/misc/taskwarrior-tui/Cargo.lock deleted file mode 100644 index aa5d7cbfe98..00000000000 --- a/pkgs/applications/misc/taskwarrior-tui/Cargo.lock +++ /dev/null @@ -1,1632 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -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 = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" - -[[package]] -name = "arc-swap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "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.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "better-panic" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" -dependencies = [ - "backtrace", - "console", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clap" -version = "3.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_complete" -version = "3.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4179da71abd56c26b54dd0c248cc081c1f43b0a1a7e8448e28e57a29baa993d" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "3.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clipboard-win" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "terminal_size", - "winapi", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags", - "crossterm_winapi", - "futures-core", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling", - "derive_builder_core", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[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" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[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 = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[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-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "fd-lock" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" - -[[package]] -name = "futures-executor" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" - -[[package]] -name = "futures-macro" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" - -[[package]] -name = "futures-task" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" - -[[package]] -name = "futures-util" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "iana-time-zone" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "io-lifetimes" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" - -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[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.132" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log4rs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "derivative", - "fnv", - "humantime", - "libc", - "log", - "log-mdc", - "parking_lot", - "serde", - "serde-value", - "serde_json", - "serde_yaml", - "thiserror", - "thread-id", - "typemap", - "winapi", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[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 = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" - -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - -[[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", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "path-clean" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" - -[[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 = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[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", - "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-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[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", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[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", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustix" -version = "0.35.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustyline" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e" -dependencies = [ - "bitflags", - "cfg-if", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" - -[[package]] -name = "socket2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "task-hookrs" -version = "0.7.0" -source = "git+https://github.com/kdheepak/task-hookrs#6f04ee63c0d58bb0fe9bd6563457df52b5b5f84d" -dependencies = [ - "chrono", - "derive_builder", - "failure", - "log", - "serde", - "serde_derive", - "serde_json", - "uuid", -] - -[[package]] -name = "taskwarrior-tui" -version = "0.23.7" -dependencies = [ - "anyhow", - "better-panic", - "cassowary", - "chrono", - "clap", - "clap_complete", - "crossterm", - "dirs", - "futures", - "itertools", - "lazy_static", - "log", - "log4rs", - "path-clean", - "rand", - "regex", - "rustyline", - "serde", - "serde_json", - "shellexpand", - "shlex", - "task-hookrs", - "tokio", - "tokio-stream", - "tui", - "unicode-segmentation", - "unicode-truncate", - "unicode-width", - "uuid", - "versions", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "thiserror" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" -dependencies = [ - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "tokio" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - -[[package]] -name = "tui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags", - "cassowary", - "crossterm", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "typemap" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -dependencies = [ - "unsafe-any", -] - -[[package]] -name = "unicode-ident" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-truncate" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04be5ca5f7a4a7270ffea82bc41c59b87c611ed04f20e77c338e8d3c2348e42" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "unsafe-any" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -dependencies = [ - "traitobject", -] - -[[package]] -name = "utf8parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "versions" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee97e1d97bd593fb513912a07691b742361b3dd64ad56f2c694ea2dbfe0665d3" -dependencies = [ - "itertools", - "nom", -] - -[[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.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 1fd60f33eec..f05ff81a167 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -6,27 +6,22 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.23.7"; + version = "0.25.1"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-D7+C02VlE42wWQSOkeTJVDS4rWnGB06RTZ7tzdpYmZw="; + sha256 = "sha256-m/VExBibScZt8zlxbTSQtZdbcc1EBZ+k0DXu+pXFUnA="; }; + cargoHash = "sha256-DFf4leS8/891YzZCkkd/rU+cUm94nOnXYDZgJK+NoCY="; + nativeBuildInputs = [ installShellFiles ]; # Because there's a test that requires terminal access doCheck = false; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "task-hookrs-0.7.0" = "sha256-EGnhUgYxygU3JrYXQPE9SheuXWS91qEwR+w3whaYuYw="; - }; - }; - postInstall = '' installManPage docs/taskwarrior-tui.1 installShellCompletion completions/taskwarrior-tui.{bash,fish} --zsh completions/_taskwarrior-tui From 70e9e2cd8132bb8b80ff82867f021ac76165010e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:12:54 +0200 Subject: [PATCH 68/88] plasma-pass: 1.2.0 -> 1.2.1 Signed-off-by: Matthias Beyer --- pkgs/tools/security/plasma-pass/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix index 2ff2ab38cef..f47cd69d43d 100644 --- a/pkgs/tools/security/plasma-pass/default.nix +++ b/pkgs/tools/security/plasma-pass/default.nix @@ -8,14 +8,19 @@ mkDerivation rec { pname = "plasma-pass"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "plasma"; repo = "plasma-pass"; - rev = "v${version}"; - sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1"; + sha256 = "sha256-lCNskOXkSIcMPcMnTWE37sDCXfmtP0FhyMzxeF6L0iU="; + + # So the tag is actually "v0.2.1" but the released version is later than + # 1.2.0 and the "release" on the gitlab page also says "1.2.1". + # I guess they just messed up the tag subject and description. + # Maintainer of plasma-pass was notified about this 2023-08-13 + rev = "v0.2.1"; }; buildInputs = [ From 02c20a20d9f51761a3bacb67be916fd0cc2139f1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 12 Aug 2023 14:42:08 -0700 Subject: [PATCH 69/88] python311Packages.mcstatus: 11.0.0 -> 11.0.1 --- pkgs/development/python-modules/mcstatus/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 9643dc01406..cff34c84442 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -1,10 +1,10 @@ { lib , asyncio-dgram , buildPythonPackage -, click , dnspython , fetchFromGitHub , poetry-core +, poetry-dynamic-versioning , pytest-asyncio , pytest-rerunfailures , pytestCheckHook @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "11.0.0"; + version = "11.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,25 +22,26 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+r6WL59T9rNAKl3r4Hef75uJoD7DRYA23uS/OlzRyRk="; + hash = "sha256-1jPIsFEJ17kjtCBiX4IvSf2FxYw9DkH3MrrJ85N71tc="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" ''; nativeBuildInputs = [ poetry-core + poetry-dynamic-versioning ]; propagatedBuildInputs = [ asyncio-dgram - click dnspython ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-asyncio pytest-rerunfailures From 07b516098730b5946aac465d8829e32ed9707085 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:38:21 +0200 Subject: [PATCH 70/88] python311Packages.aiomqtt: 1.0.0 -> 1.1.0 Diff: https://github.com/sbtinstruments/aiomqtt/compare/refs/tags/v1.0.0...v1.1.0 Changelog: https://github.com/sbtinstruments/aiomqtt/blob/1.1.0/CHANGELOG.md --- .../python-modules/aiomqtt/default.nix | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 17f2cb45e6a..68e79900849 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -1,41 +1,29 @@ { lib +, anyio , buildPythonPackage , fetchFromGitHub -, fetchpatch - -# build-system +, paho-mqtt , poetry-core , poetry-dynamic-versioning - -# dependencies -, paho-mqtt -, typing-extensions - -# tests -, anyio , pytestCheckHook +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "aiomqtt"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "sbtinstruments"; repo = "aiomqtt"; - rev = "v${version}"; - hash = "sha256-ct4KIGxiC5m0yrid0tOa/snO9oErxbqhLLH9kD69aEQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-8f3opbvN/hmT6AEMD7Co5n5IqdhP0higbaDGUBWJRzU="; }; - patches = [ - (fetchpatch { - # adds test marker for network access - url = "https://github.com/sbtinstruments/aiomqtt/commit/225c1bfc99bc6ff908bd03c1115963e43ab8a9e6.patch"; - hash = "sha256-UMEwCoX2mWBA7+p+JujkH5fc9sd/2hbb28EJ0fN24z4="; - }) - ]; - nativeBuildInputs = [ poetry-core poetry-dynamic-versioning @@ -46,13 +34,15 @@ buildPythonPackage rec { typing-extensions ]; - pythonImportsCheck = [ "aiomqtt" ]; - nativeCheckInputs = [ anyio pytestCheckHook ]; + pythonImportsCheck = [ + "aiomqtt" + ]; + pytestFlagsArray = [ "-m" "'not network'" ]; @@ -60,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "The idiomatic asyncio MQTT client, wrapped around paho-mqtt"; homepage = "https://github.com/sbtinstruments/aiomqtt"; - changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From afe5b9dd6cb902243b77211c632c4798cef30725 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:41:17 +0200 Subject: [PATCH 71/88] python311Packages.google-cloud-bigtable: 2.20.0 -> 2.21.0 Changelog: https://github.com/googleapis/python-bigtable/blob/v2.21.0/CHANGELOG.md --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 773eea02e4b..9b214bebdfd 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.20.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PUeEqed0crzfHLAHDDu4GgktMaNt11nuovfMIkz5iwk="; + hash = "sha256-2fDvv5QMo5LwfRN4f8LadtHhaN7a+uD48bQgjgwRMtw="; }; propagatedBuildInputs = [ From 37ee7a563cb184bd8665884abfd911b5fc261dc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:43:31 +0200 Subject: [PATCH 72/88] python311Packages.google-cloud-container: 2.28.0 -> 2.29.0 Changelog: https://github.com/googleapis/python-container/blob/v2.29.0/CHANGELOG.md --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index db7ab280b4b..531e2819f9d 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.28.0"; + version = "2.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yML87bCWsuiV+jcznu6QDaLwKxSCb4Nd2BUm5f+wtRE="; + hash = "sha256-kBcdzhfr5k5MiSJu3tVyE09a5whQgj6m1AsUEwcQxS4="; }; propagatedBuildInputs = [ From 5fdc46492ecd63c30600590ec013be7c4f88d45b Mon Sep 17 00:00:00 2001 From: Stzx Date: Sun, 13 Aug 2023 17:25:09 +0800 Subject: [PATCH 73/88] liberation_ttf_v2: 2.1.0 -> 2.1.5 --- pkgs/data/fonts/liberation-fonts/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix index 04ee3781b6b..f24ca84c533 100644 --- a/pkgs/data/fonts/liberation-fonts/default.nix +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -4,7 +4,7 @@ let commonNativeBuildInputs = [ fontforge python3 ]; common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null }: + { version, repo, sha256, docsToInstall, nativeBuildInputs, postPatch ? null }: stdenv.mkDerivation rec { pname = "liberation-fonts"; inherit version; @@ -20,11 +20,7 @@ let installPhase = '' find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true - install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true - install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true - install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true - install -m444 -Dt $out/share/doc/${pname}-${version} README || true + install -m444 -Dt $out/share/doc/${pname}-${version} ${lib.concatStringsSep " " docsToInstall} ''; meta = with lib; { @@ -51,18 +47,20 @@ in liberation_ttf_v1 = common { repo = "liberation-1.7-fonts"; version = "1.07.5"; - nativeBuildInputs = commonNativeBuildInputs ; + docsToInstall = [ "AUTHORS" "ChangeLog" "COPYING" "License.txt" "README" ]; + nativeBuildInputs = commonNativeBuildInputs; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; }; liberation_ttf_v2 = common { repo = "liberation-fonts"; - version = "2.1.0"; + version = "2.1.5"; + docsToInstall = [ "AUTHORS" "ChangeLog" "LICENSE" "README.md" ]; nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; - sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz"; + sha256 = "Wg1uoD2k/69Wn6XU+7wHqf2KO/bt4y7pwgmG7+IUh4Q="; }; } From 7301b48f7f7a085fe12834a269ff8aa8bd9fe152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:50:30 +0200 Subject: [PATCH 74/88] python311Packages.goocalendar: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/goocalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 65cf304acc2..3c542608b29 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.2"; + version = "0.8.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "318b3b7790ac9d6d98881eee3b676fc9c17fc15d21dcdaff486e3c303333b41a"; + sha256 = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; nativeBuildInputs = [ From c52a226159e8a8cc7a42a105fd79061f58aa39d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:51:41 +0200 Subject: [PATCH 75/88] python311Packages.goocalendar: add changelog to meta --- pkgs/development/python-modules/goocalendar/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 3c542608b29..bd26568b704 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; + hash = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A calendar widget for GTK using PyGoocanvas."; homepage = "https://goocalendar.tryton.org/"; + changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; license = licenses.gpl2; maintainers = [ maintainers.udono ]; }; From 63bc7f8f35b1d8515c1913ae15d62c80035aed27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:53:39 +0200 Subject: [PATCH 76/88] python311Packages.goocalendar: specifiy license --- pkgs/development/python-modules/goocalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index bd26568b704..9e1be50b436 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "A calendar widget for GTK using PyGoocanvas."; homepage = "https://goocalendar.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; - license = licenses.gpl2; - maintainers = [ maintainers.udono ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ udono ]; }; } From 91074af2ab139459d7c34bce1a82d399f049e8ab Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 13 Aug 2023 19:53:52 +1000 Subject: [PATCH 77/88] squeekboard: 1.21 -> 1.22 https://gitlab.gnome.org/World/Phosh/squeekboard/-/releases/v1.22.0 --- pkgs/applications/accessibility/squeekboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 0b58fb9c905..82d3fe192d9 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-Mn0E+R/UzBLHPvarQHlEN4JBpf4VAaXdKdWLsFEyQE4="; + hash = "sha256-Rk6LOCZ5bhoo5ORAIIYWENrKUIVypd8bnKjyyBSbUYg="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp Cargo.lock.newer Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-F2mef0HvD9WZRx05DEpQ1AO1skMwcchHZzJa74AHmsM="; + hash = "sha256-DygWra4R/w8KzkFzIVm4+ePpUpjiYGaDx2NQm6o+tWQ="; }; mesonFlags = [ From 3f38bbf6ae2cf3bf99641e0ea585800966a3bf3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:54:28 +0200 Subject: [PATCH 78/88] python311Packages.goocalendar: add format and update disabled --- pkgs/development/python-modules/goocalendar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 9e1be50b436..412b9dbe896 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -6,14 +6,15 @@ , gobject-introspection , pygobject3 , goocanvas2 -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "GooCalendar"; version = "0.8.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 9bea50a421b71d36fc583ab816bd696b7d9016db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:55:21 +0200 Subject: [PATCH 79/88] python311Packages.goocalendar: normalize pname --- pkgs/development/python-modules/goocalendar/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 412b9dbe896..2a42a775f3d 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -10,14 +10,15 @@ }: buildPythonPackage rec { - pname = "GooCalendar"; + pname = "goocalendar"; version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "GooCalendar"; + inherit version; hash = "sha256-LwL5TLRkD6ALucabLUeB0k4rIX+O/aW2ebS2rZPjIUs="; }; @@ -39,7 +40,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "A calendar widget for GTK using PyGoocanvas."; + description = "A calendar widget for GTK using PyGoocanvas"; homepage = "https://goocalendar.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/goocalendar/-/blob/${version}/CHANGELOG"; license = licenses.gpl2Only; From 9549e2aa9ba87682b430ed58dad00049b7d9eaaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:57:17 +0200 Subject: [PATCH 80/88] python311Packages.goocalendar: add pythonImportsCheck --- .../python-modules/goocalendar/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 2a42a775f3d..a9d69447c2c 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -1,11 +1,11 @@ { lib -, fetchPypi , buildPythonPackage -, pkg-config -, gtk3 +, fetchPypi , gobject-introspection -, pygobject3 , goocanvas2 +, gtk3 +, pkg-config +, pygobject3 , pythonOlder }: @@ -39,6 +39,10 @@ buildPythonPackage rec { # No upstream tests available doCheck = false; + pythonImportsCheck = [ + "goocalendar" + ]; + meta = with lib; { description = "A calendar widget for GTK using PyGoocanvas"; homepage = "https://goocalendar.tryton.org/"; From f328790bcf7362a0acb2a2245b1f4b97d65ffb69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 11:59:41 +0200 Subject: [PATCH 81/88] python311Packages.ibm-watson: 7.0.0 -> 7.0.1 Diff: https://github.com/watson-developer-cloud/python-sdk/compare/refs/tags/v7.0.0...v7.0.1 --- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 5a63e79b3ff..01e6a797782 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-AerEd4TkK/A0KhSy+QWxRDD4pjobsx4oDxMr+wUCGt0="; + hash = "sha256-f/nf9WFiUNDQBkFNMV16EznCw0TN9L4fDIPQ/j4B1Sc="; }; propagatedBuildInputs = [ From c316383a6ccfec77ff38b4b43821b57172f55ef9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 12:01:00 +0200 Subject: [PATCH 82/88] python311Packages.ibm-watson: add changelog to meta --- pkgs/development/python-modules/ibm-watson/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 01e6a797782..d7666abf58d 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk"; + changelog = "https://github.com/watson-developer-cloud/python-sdk/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; }; From 4f9ae918e3d8fb92cf1806c602d4d685ea54f573 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 12:02:37 +0200 Subject: [PATCH 83/88] python311Packages.ibm-watson: remove postPatch section --- .../python-modules/ibm-watson/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index d7666abf58d..522b7b13cc1 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, responses -, pytestCheckHook -, python-dotenv -, pytest-rerunfailures -, requests -, python-dateutil -, websocket-client , ibm-cloud-sdk-core +, pytest-rerunfailures +, pytestCheckHook +, python-dateutil +, python-dotenv , pythonOlder +, requests +, responses +, websocket-client }: buildPythonPackage rec { @@ -27,24 +27,19 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - requests - python-dateutil - websocket-client ibm-cloud-sdk-core + python-dateutil + requests + websocket-client ]; nativeCheckInputs = [ - responses + pytest-rerunfailures pytestCheckHook python-dotenv - pytest-rerunfailures + responses ]; - postPatch = '' - substituteInPlace setup.py \ - --replace websocket-client==1.1.0 websocket-client>=1.1.0 - ''; - pythonImportsCheck = [ "ibm_watson" ]; From d8b50ae3197b0a12984e23321c59e67886706d97 Mon Sep 17 00:00:00 2001 From: Adam Stephens <2071575+adamcstephens@users.noreply.github.com> Date: Sun, 13 Aug 2023 07:21:29 -0400 Subject: [PATCH 84/88] sabnbzd: 3.7.2 -> 4.0.3 (#248411) * sabctools: init at 7.0.2 * sabnbzd: 3.7.2 -> 4.0.3 --- .../python-modules/sabctools/default.nix | 27 ++++++++++++++ pkgs/servers/sabnzbd/default.nix | 37 +++++++++++++++---- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/sabctools/default.nix diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix new file mode 100644 index 00000000000..ce536c90c3d --- /dev/null +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -0,0 +1,27 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + sabnzbd, +}: +buildPythonPackage rec { + pname = "sabctools"; + version = "7.0.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AB5/McuOIDkhu7rtb3nFaqOTx3zwm92+3NEnH5HjzBo="; + }; + + pythonImportsCheck = ["sabctools"]; + + passthru.tests = {inherit sabnzbd;}; + + meta = with lib; { + description = "C implementations of functions for use within SABnzbd"; + homepage = "https://github.com/sabnzbd/sabctools"; + license = licenses.gpl2Only; + maintainers = with maintainers; [adamcstephens]; + }; +} diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index a0a6eb72e74..67b55dd23f0 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,37 +1,60 @@ { lib, stdenv +, coreutils , fetchFromGitHub , python3 , par2cmdline , unzip , unrar , p7zip +, util-linux , makeWrapper , nixosTests }: let pythonEnv = python3.withPackages(ps: with ps; [ + babelfish + cffi chardet cheetah3 + cheroot cherrypy - cryptography configobj + cryptography feedparser - sabyenc3 - puremagic guessit + jaraco-classes + jaraco-collections + jaraco-context + jaraco-functools + jaraco-text + more-itertools + notify2 + orjson + portend + puremagic + pycparser pysocks + python-dateutil + pytz + rebulk + sabctools + sabyenc3 + sgmllib3k + six + tempora + zc_lockfile ]); - path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; + path = lib.makeBinPath [ coreutils par2cmdline unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "3.7.2"; + version = "4.0.3"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-1gGvdc6TJrkFIrN+TUL/7EejApgpgAQxnQbp8RMknHQ="; + sha256 = "sha256-6d/UGFuySgKvpqhGjzl007GS9yMgfgI3YwTxkxsCzew="; }; nativeBuildInputs = [ makeWrapper ]; @@ -59,6 +82,6 @@ in stdenv.mkDerivation rec { homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with lib.maintainers; [ fridh jojosch ]; + maintainers = with lib.maintainers; [ fridh jojosch adamcstephens ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3bbf25c843..fef64074b67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11268,6 +11268,8 @@ self: super: with self; { s3-credentials = callPackage ../development/python-modules/s3-credentials { }; + sabctools = callPackage ../development/python-modules/sabctools { }; + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; sabyenc = callPackage ../development/python-modules/sabyenc { }; From 7ad7e99370e1a281f0edd307f70f50b577ce876a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 13 Jul 2023 13:02:57 +0200 Subject: [PATCH 85/88] nixos/gitea-actions-runner: settings option to configure daemon --- .../gitea-actions-runner.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index fb70c489912..6a0c740daae 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -31,6 +31,8 @@ let cfg = config.services.gitea-actions-runner; + settingsFormat = pkgs.formats.yaml { }; + # Check whether any runner instance label requires a container runtime # Empty label strings result in the upstream defined defaultLabels, which require docker # https://gitea.com/gitea/act_runner/src/tag/v0.1.5/internal/app/cmd/register.go#L93-L98 @@ -119,6 +121,18 @@ in that follows the filesystem hierarchy standard. ''; }; + settings = mkOption { + description = lib.mdDoc '' + Configuration for `act_runner daemon`. + See https://gitea.com/gitea/act_runner/src/branch/main/internal/pkg/config/config.example.yaml for an example configuration + ''; + + type = types.submodule { + freeformType = settingsFormat.type; + }; + + default = { }; + }; hostPackages = mkOption { type = listOf package; @@ -169,6 +183,7 @@ in wantsHost = hasHostScheme instance; wantsDocker = wantsContainerRuntime && config.virtualisation.docker.enable; wantsPodman = wantsContainerRuntime && config.virtualisation.podman.enable; + configFile = settingsFormat.generate "config.yaml" instance.settings; in nameValuePair "gitea-runner-${escapeSystemdPath name}" { inherit (instance) enable; @@ -222,7 +237,7 @@ in fi ''; - ExecStart = "${cfg.package}/bin/act_runner daemon"; + ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}"; SupplementaryGroups = optionals (wantsDocker) [ "docker" ] ++ optionals (wantsPodman) [ From 3d58bac73be93af787e6642f64296617edec88a7 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 18 Jul 2023 01:56:33 +0200 Subject: [PATCH 86/88] services.gitea-actions-runner: make ExecStartPre extensible --- .../services/continuous-integration/gitea-actions-runner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index 6a0c740daae..9752ba8b2a3 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -211,7 +211,7 @@ in User = "gitea-runner"; StateDirectory = "gitea-runner"; WorkingDirectory = "-/var/lib/gitea-runner/${name}"; - ExecStartPre = pkgs.writeShellScript "gitea-register-runner-${name}" '' + ExecStartPre = [(pkgs.writeShellScript "gitea-register-runner-${name}" '' export INSTANCE_DIR="$STATE_DIRECTORY/${name}" mkdir -vp "$INSTANCE_DIR" cd "$INSTANCE_DIR" @@ -236,7 +236,7 @@ in echo "$LABELS_WANTED" > "$LABELS_FILE" fi - ''; + '')]; ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}"; SupplementaryGroups = optionals (wantsDocker) [ "docker" From 38b2c039bd36e6769fb8ce9878ef9ddccdb80675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 11 Aug 2023 13:43:30 +0200 Subject: [PATCH 87/88] gitea-actions-runner: restart on failure --- .../services/continuous-integration/gitea-actions-runner.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index 9752ba8b2a3..d8d25898e29 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -211,6 +211,11 @@ in User = "gitea-runner"; StateDirectory = "gitea-runner"; WorkingDirectory = "-/var/lib/gitea-runner/${name}"; + + # gitea-runner might fail when gitea is restarted during upgrade. + Restart = "on-failure"; + RestartSec = 2; + ExecStartPre = [(pkgs.writeShellScript "gitea-register-runner-${name}" '' export INSTANCE_DIR="$STATE_DIRECTORY/${name}" mkdir -vp "$INSTANCE_DIR" From 4022b2733af68f5ab623f8a801fda4bd3f017726 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 13 Aug 2023 18:11:00 +0800 Subject: [PATCH 88/88] nixos/rustus: add user name to enable restoring of backups --- nixos/modules/services/web-servers/rustus.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/web-servers/rustus.nix b/nixos/modules/services/web-servers/rustus.nix index 95c9a645557..878d790e366 100644 --- a/nixos/modules/services/web-servers/rustus.nix +++ b/nixos/modules/services/web-servers/rustus.nix @@ -226,6 +226,10 @@ in serviceConfig = { ExecStart = "${pkgs.rustus}/bin/rustus"; StateDirectory = "rustus"; + # User name is defined here to enable restoring a backup for example + # You will run the backup restore command as sudo -u rustus in order + # to have write permissions to /var/lib + User = "rustus"; DynamicUser = true; LoadCredential = lib.optionals isHybridS3 [ "S3_ACCESS_KEY_PATH:${cfg.storage.s3_access_key_file}"