From 25e8a273af4099fdb8886b7b3ad554fb318ca9ed Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 28 Feb 2024 22:04:51 +0100 Subject: [PATCH 001/215] nixos/xl2tpd: prefer 'install' over 'chmod/chown' --- nixos/modules/services/networking/xl2tpd.nix | 21 ++++---------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 7d2595707612..c0a433ac25c9 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -104,31 +104,18 @@ with lib; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p -m 700 /etc/xl2tpd + install -m 700 -d /etc/xl2tpd/ppp - pushd /etc/xl2tpd > /dev/null - - mkdir -p -m 700 ppp - - [ -f ppp/chap-secrets ] || cat > ppp/chap-secrets << EOF + [ -f /etc/xl2tpd/ppp/chap-secrets ] || install -m 600 -o root -g root /dev/stdin /etc/xl2tpd/ppp/chap-secrets < l2tp-secrets - chown root:root l2tp-secrets - chmod 600 l2tp-secrets + [ -f /etc/xl2tpd/l2tp-secrets ] || install -m 600 -o root -g root <(echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) /etc/xl2tpd/l2tp-secrets - popd > /dev/null - - mkdir -p /run/xl2tpd - chown root:root /run/xl2tpd - chmod 700 /run/xl2tpd + install -m 701 -o root -g root -d /run/xl2tpd ''; serviceConfig = { From 189fc6cfbfd2bd955f42a6fffe7a70033cf9cc1c Mon Sep 17 00:00:00 2001 From: Pablo Andres Dealbera Date: Wed, 14 Aug 2024 14:35:57 -0300 Subject: [PATCH 002/215] nixos/bazarr: set systemd config KillSignal to SIGINT to fix timeout --- nixos/modules/services/misc/bazarr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/bazarr.nix b/nixos/modules/services/misc/bazarr.nix index 99343a146a7a..76a26c2ebbf0 100644 --- a/nixos/modules/services/misc/bazarr.nix +++ b/nixos/modules/services/misc/bazarr.nix @@ -55,6 +55,7 @@ in --no-update True ''; Restart = "on-failure"; + KillSignal = "SIGINT"; }; }; From 06c801075527868dd888dc89cd91e1145f76ab57 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 21 Aug 2024 17:05:30 +0000 Subject: [PATCH 003/215] uboot: missing perl dependency Depending on the configuration, perl might be required. Perl is used to build the OID database, which is required for EFI secureboot (at least). --- pkgs/misc/uboot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 295cb525a646..4105eccd6243 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -17,6 +17,7 @@ , swig , which , python3 +, perl , armTrustedFirmwareAllwinner , armTrustedFirmwareAllwinnerH6 , armTrustedFirmwareAllwinnerH616 @@ -88,6 +89,7 @@ let ])) swig which # for scripts/dtc-version.sh + perl # for oid build (secureboot) ] ++ lib.optionals (!crossTools) toolsDeps; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals crossTools toolsDeps; From 8f66f0bcf94e11f6c67459dbe8f3ff4aa9abbbae Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 24 Aug 2024 14:20:44 +0200 Subject: [PATCH 004/215] php81: replace local patch with an official commit --- pkgs/development/interpreters/php/8.1.nix | 5 +++- ...php81-fix-libxml2-2.13-compatibility.patch | 28 ------------------- pkgs/top-level/php-packages.nix | 25 +++++++++++++---- 3 files changed, 24 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 204bf316e842..8e606f5ccb40 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -21,7 +21,10 @@ let }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ./php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; diff --git a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch b/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch deleted file mode 100644 index b4624676ee29..000000000000 --- a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h -index a1011f0b17..7a7622c482 100644 ---- a/ext/libxml/php_libxml.h -+++ b/ext/libxml/php_libxml.h -@@ -119,6 +119,23 @@ PHP_LIBXML_API void php_libxml_shutdown(void); - ZEND_TSRMLS_CACHE_EXTERN() - #endif - -+#if defined(__clang__) -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \ -+ _Pragma("clang diagnostic push") \ -+ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \ -+ _Pragma("clang diagnostic pop") -+#elif defined(__GNUC__) -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \ -+ _Pragma("GCC diagnostic push") \ -+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \ -+ _Pragma("GCC diagnostic pop") -+#else -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END -+#endif -+ - /* Other extension may override the global state options, these global options - * are copied initially to ctxt->options. Set the options to a known good value. - * See libxml2 globals.c and parserInternals.c. diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e85ae6dea40a..e8b4abf0e907 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -404,7 +404,10 @@ in { }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.1") [ # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END - ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; @@ -646,7 +649,10 @@ in { }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; @@ -693,7 +699,10 @@ in { }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; @@ -755,7 +764,10 @@ in { }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; @@ -802,7 +814,10 @@ in { }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; From 9a04e8dc45ef677a096cc5f14672c14fe79b066c Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:07:32 +0200 Subject: [PATCH 005/215] php81: replace a patch from a fork with an official commit --- pkgs/development/interpreters/php/8.1.nix | 2 +- pkgs/top-level/php-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 8e606f5ccb40..88fd77609c41 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -27,7 +27,7 @@ let }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e8b4abf0e907..bdc59028a519 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -410,7 +410,7 @@ in { }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ @@ -655,7 +655,7 @@ in { }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ @@ -705,7 +705,7 @@ in { }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ @@ -770,7 +770,7 @@ in { }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ @@ -820,7 +820,7 @@ in { }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [ From 4cfe15f91343cd89aa01b0c68f85987ac2a158b6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 29 Feb 2024 17:23:30 -0500 Subject: [PATCH 006/215] root: workaround upsteam issue 14778 --- pkgs/applications/science/misc/root/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index fd998f732818..6e166744f499 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,6 +4,7 @@ , fetchgit , fetchurl , makeWrapper +, writeText , cmake , coreutils , git @@ -225,7 +226,11 @@ stdenv.mkDerivation rec { ''; # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + env.CXXFLAGS = lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + + # workaround for + # https://github.com/root-project/root/issues/14778 + env.NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}"; # To use the debug information on the fly (without installation) # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) From 1cf3c6b671e5ee3fc0f4b031199c1410afb00e39 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 17:05:23 +0200 Subject: [PATCH 007/215] fatrop: 0.0.1 -> 0.0.3 Diff: https://github.com/meco-group/fatrop/compare/v0.0.1...0.0.3 --- pkgs/by-name/fa/fatrop/package.nix | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index e85eede1e2d9..bbdaf74fe1b7 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -2,6 +2,7 @@ blasfeo, cmake, fetchFromGitHub, + fetchpatch, lib, llvmPackages, python3Packages, @@ -11,25 +12,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-c4qYh8RutRsMIx3m0oxXy73fnLTBGVZ1QjFcLEJ413Y="; + hash = "sha256-vCGix3qYQR9bY9GoIyBMrTNvsMgt0h7TZUye6wlH9H8="; }; - postPatch = lib.optionalString pythonSupport '' - # avoid submodule - rmdir external/pybind11 - ln -s ${python3Packages.pybind11.src} external/pybind11 - - # install python module - echo "" >> fatropy/CMakeLists.txt - echo "install(DIRECTORY fatropy DESTINATION ${python3Packages.python.sitePackages})" >> fatropy/CMakeLists.txt - echo "install(TARGETS _fatropy DESTINATION ${python3Packages.python.sitePackages}/fatropy)" >> fatropy/CMakeLists.txt - ''; + patches = lib.optionals pythonSupport [ + # fix python packaging + # ref. https://github.com/meco-group/fatrop/pull/17 + # this was merged upstream and can be removed on next release + (fetchpatch { + url = "https://github.com/meco-group/fatrop/pull/17/commits/22e33c216e47df90dc060686d7d1806233642249.patch"; + hash = "sha256-0/uSHAXVzXVyR+kklQGvraLA6sJbHzUcAp3eEHQK068="; + }) + (fetchpatch { + url = "https://github.com/meco-group/fatrop/pull/17/commits/0c03fd9fec95de42976fed1770a15081d0874ee2.patch"; + hash = "sha256-FenQ05rqn9EbU0wDVQQ1OFxSXj1fL/rOFKOcP8t1NwY="; + }) + ]; nativeBuildInputs = [ cmake ]; buildInputs = From 697e301788c0d890324030880d1fc2f8b14bd3a8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 20:31:07 +0200 Subject: [PATCH 008/215] casadi: build with fatrop thanks @traversaro ! --- pkgs/by-name/ca/casadi/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 9c39449704df..385145be5883 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -47,30 +47,33 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Fix build with system spral + # This was merged upstream and can be removed on next release (fetchpatch { name = "add-FindSPRAL.cmake.patch"; url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch"; hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ="; }) + # Fix build with fatrop + # This was merged upstream and can be removed on next release + (fetchpatch { + url = "https://github.com/casadi/casadi/pull/3832/commits/4d4edb21521817fc980da5e570a607ad2f15aaa2.patch"; + hash = "sha256-ui8pMaBz848Yv5xNlruPp9IFUhc97ZgvXGXqpxJG1Es="; + }) ]; postPatch = '' - # fix case of fatropConfig.cmake & hpipmConfig.cmake + # fix case of hpipmConfig.cmake substituteInPlace CMakeLists.txt --replace-fail \ "FATROP HPIPM" \ - "fatrop hpipm" + "FATROP hpipm" # nix provide lib/clang headers in libclang, not in llvm. substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ '$'{CLANG_LLVM_LIB_DIR} \ ${llvmPackages_17.libclang.lib}/lib - # fix fatrop includes - substituteInPlace casadi/interfaces/fatrop/fatrop_conic_interface.hpp --replace-fail \ - " Date: Mon, 16 Sep 2024 18:55:23 +0000 Subject: [PATCH 009/215] go-md2man: 2.0.4 -> 2.0.5 --- pkgs/development/tools/misc/go-md2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index ee8b8d38b565..b66584b90a93 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "go-md2man"; - version = "2.0.4"; + version = "2.0.5"; vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0="; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "sha256-pQ+H8Psh92KWTang8hK0cHFLomH+4X0rMMilIJUQ4Qc="; + sha256 = "sha256-UX9FajFqZApVFED3MYcq167iPwztnIck25ehfcOeFD8="; }; meta = with lib; { From 28f2f2a4f9723cf730e427952922755c2d552dfc Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 20 Sep 2024 09:01:45 +0000 Subject: [PATCH 010/215] darwin.xcode: add 15.0.1 and 16 --- pkgs/os-specific/darwin/xcode/default.nix | 2 ++ pkgs/top-level/darwin-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 1aa1a5693655..dc097bfc9536 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -83,9 +83,11 @@ in lib.makeExtensible (self: { xcode_14 = requireXcode "14" "sha256-E+wjPgQx/lbYAsauksdmGsygL5VPBA8R9pHB93eA7T0="; xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs="; xcode_15 = requireXcode "15" "sha256-ffqISt2Ayccln5BArKIjSdzbEgoSoNwq8TPLGysAE0c="; + xcode_15_0_1 = requireXcode "15.0.1" "sha256-ZJFCA2HUNmw8NxW3wyIyIsMr8k6z50BHqu9IE2VjuOg="; xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0="; xcode_15_2 = requireXcode "15.2" "sha256-9B/4Tdyb3QGAzm579QGn5Iq/hA2hscD8OcoSJ5BFFXs="; xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM="; xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U="; + xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index f0bdad863e90..5960be9dc685 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -197,7 +197,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 xcode_14 xcode_14_1 - xcode_15 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 + xcode_15 xcode_15_0_1 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 + xcode_16 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { From 2f34e5e90969a39fd1c492c22383120e46ea9015 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 20 Sep 2024 15:31:07 +0200 Subject: [PATCH 011/215] fatrop: 0.0.3 -> 0.0.4 --- pkgs/by-name/fa/fatrop/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index bbdaf74fe1b7..f3c4b8606dee 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -2,7 +2,6 @@ blasfeo, cmake, fetchFromGitHub, - fetchpatch, lib, llvmPackages, python3Packages, @@ -12,29 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-vCGix3qYQR9bY9GoIyBMrTNvsMgt0h7TZUye6wlH9H8="; + hash = "sha256-XVOS9L2vQeFkPXZieX1ZJiVagR0f2BtiRmSDPB9LQeI="; }; - patches = lib.optionals pythonSupport [ - # fix python packaging - # ref. https://github.com/meco-group/fatrop/pull/17 - # this was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/meco-group/fatrop/pull/17/commits/22e33c216e47df90dc060686d7d1806233642249.patch"; - hash = "sha256-0/uSHAXVzXVyR+kklQGvraLA6sJbHzUcAp3eEHQK068="; - }) - (fetchpatch { - url = "https://github.com/meco-group/fatrop/pull/17/commits/0c03fd9fec95de42976fed1770a15081d0874ee2.patch"; - hash = "sha256-FenQ05rqn9EbU0wDVQQ1OFxSXj1fL/rOFKOcP8t1NwY="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ blasfeo ] From 58473a3c1a7e424fca88eb1f954e153deb51a2d8 Mon Sep 17 00:00:00 2001 From: MickaelRoger Date: Thu, 26 Sep 2024 22:13:28 +0200 Subject: [PATCH 012/215] nixos/anki-sync-server: add setting There is no option to specify where the anki-sync-server data will be stored. This commit adds this option. --- nixos/modules/services/misc/anki-sync-server.md | 9 +++++++++ nixos/modules/services/misc/anki-sync-server.nix | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/anki-sync-server.md b/nixos/modules/services/misc/anki-sync-server.md index 4796abf25c43..1210cad6d0af 100644 --- a/nixos/modules/services/misc/anki-sync-server.md +++ b/nixos/modules/services/misc/anki-sync-server.md @@ -42,6 +42,15 @@ Here, `passwordFile` is the path to a file containing just the password in plaintext. Make sure to set permissions to make this file unreadable to any user besides root. +By default, synced data are stored in */var/lib/anki-sync-server/*ankiuser**. +You can change the directory by using `services.anki-sync-server.baseDirectory` + +```nix +{ + services.anki-sync-server.baseDirectory = "/home/anki/data"; +} +``` + By default, the server listen address {option}`services.anki-sync-server.host` is set to localhost, listening on port {option}`services.anki-sync-server.port`, and does not open the firewall. This diff --git a/nixos/modules/services/misc/anki-sync-server.nix b/nixos/modules/services/misc/anki-sync-server.nix index a65382009417..c77afe8c3819 100644 --- a/nixos/modules/services/misc/anki-sync-server.nix +++ b/nixos/modules/services/misc/anki-sync-server.nix @@ -59,6 +59,13 @@ in { description = "Port number anki-sync-server listens to."; }; + baseDirectory = mkOption { + type = types.str; + default = "%S/%N"; + description = "Base directory where user(s) synchronized data will be stored."; + }; + + openFirewall = mkOption { default = false; type = types.bool; @@ -114,7 +121,7 @@ in { wantedBy = ["multi-user.target"]; path = [cfg.package]; environment = { - SYNC_BASE = "%S/%N"; + SYNC_BASE = cfg.baseDirectory; SYNC_HOST = specEscape cfg.address; SYNC_PORT = toString cfg.port; }; From fd65959f5fc8d3f5b2beda543b0b3e9f9226521b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 1 Oct 2024 00:00:12 +0200 Subject: [PATCH 013/215] casadi: 3.6.6 -> 3.6.7 Diff: https://github.com/casadi/casadi/compare/3.6.6...3.6.7 --- pkgs/by-name/ca/casadi/package.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 385145be5883..cbae90c2dbe8 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -10,7 +10,6 @@ cplex, fatrop, fetchFromGitHub, - fetchpatch, gurobi, highs, hpipm, @@ -37,31 +36,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "casadi"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "casadi"; repo = "casadi"; rev = finalAttrs.version; - hash = "sha256-T4aaBS918NbUEwWkSx0URi0W9uhCB8IFmzRcOR7T8Og="; + hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; }; - patches = [ - # Fix build with system spral - # This was merged upstream and can be removed on next release - (fetchpatch { - name = "add-FindSPRAL.cmake.patch"; - url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch"; - hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ="; - }) - # Fix build with fatrop - # This was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/casadi/casadi/pull/3832/commits/4d4edb21521817fc980da5e570a607ad2f15aaa2.patch"; - hash = "sha256-ui8pMaBz848Yv5xNlruPp9IFUhc97ZgvXGXqpxJG1Es="; - }) - ]; - postPatch = '' # fix case of hpipmConfig.cmake From b57d9966875009058d01613da91f906533b38352 Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 4 Oct 2024 08:55:13 +0800 Subject: [PATCH 014/215] python3Packages.libpwquality: fix build --- pkgs/development/libraries/libpwquality/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index fade2a9194ae..e3c441a3c462 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ./python-binding-prefix.patch ]; - nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ]; + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ distutils ])) ]; buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ]; configureFlags = lib.optionals (!enablePython) [ "--disable-python-bindings" ]; From c46f9d2a3c94f18671f1a2367161aa06a49bbf79 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 5 Oct 2024 20:02:07 +0700 Subject: [PATCH 015/215] mozc: rename ibus-mozc -> mozc This package can be consumed and used by not just ibus, but by many other packages/tools, so it should have a more generic name. --- pkgs/by-name/mo/mozc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix index b374329d23ff..a1b0e804f452 100644 --- a/pkgs/by-name/mo/mozc/package.nix +++ b/pkgs/by-name/mo/mozc/package.nix @@ -17,7 +17,7 @@ let ut-dictionary = merge-ut-dictionaries.override { inherit dictionaries; }; in buildBazelPackage rec { - pname = "ibus-mozc"; + pname = "mozc"; version = "2.30.5544.102"; src = fetchFromGitHub { From 309fe2dd49d6197abb6907cc7d0de5dfb2433cc8 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 5 Oct 2024 20:09:39 +0700 Subject: [PATCH 016/215] mozc-ut: move to the top-level namespace mozc-ut is not an ibus-exclusive package, so it should live in a higher namespace --- pkgs/top-level/all-packages.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db8390e7964..e74c2a3d98ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6467,6 +6467,17 @@ with pkgs; libskk = callPackage ../development/libraries/libskk { }; + mozc-ut = mozc.override { dictionaries = [ + mozcdic-ut-alt-cannadic + mozcdic-ut-edict2 + mozcdic-ut-jawiki + mozcdic-ut-neologd + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-skk-jisyo + mozcdic-ut-sudachidict + ]; }; + m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -6516,16 +6527,7 @@ with pkgs; inherit mozc; - mozc-ut = mozc.override { dictionaries = [ - mozcdic-ut-alt-cannadic - mozcdic-ut-edict2 - mozcdic-ut-jawiki - mozcdic-ut-neologd - mozcdic-ut-personal-names - mozcdic-ut-place-names - mozcdic-ut-skk-jisyo - mozcdic-ut-sudachidict - ]; }; + inherit mozc-ut; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -7474,10 +7476,10 @@ with pkgs; fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; - fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { - abseil-cpp = abseil-cpp.override { - cxxStandard = "17"; - }; + fcitx5-mozc = callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { }; + + fcitx5-mozc-ut = callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { + mozc = mozc-ut; }; fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; From 08278f16f8ed00d78ec3e549fa1e936cfcc77cf2 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 5 Oct 2024 20:11:25 +0700 Subject: [PATCH 017/215] licenses: add naist-2003 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b1da1541c21d..e8e2dcf76fc5 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -942,6 +942,11 @@ lib.mapAttrs mkLicense ({ url = "https://license.coscl.org.cn/MulanPSL2"; }; + naist-2003 = { + spdxId = "NAIST-2003"; + fullName = "Nara Institute of Science and Technology License (2003)"; + }; + nasa13 = { spdxId = "NASA-1.3"; fullName = "NASA Open Source Agreement 1.3"; From 96df1422108321d7b202dfbf5c476840eff20a1f Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 5 Oct 2024 20:12:14 +0700 Subject: [PATCH 018/215] maintainers: add musjj --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246a78bc02ab..52bae480b708 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14587,6 +14587,11 @@ githubId = 96225281; name = "Mustafa Çalışkan"; }; + musjj = { + name = "musjj"; + github = "musjj"; + githubId = 72612857; + }; mvisonneau = { name = "Maxime VISONNEAU"; email = "maxime@visonneau.fr"; From 85d7a2abf0332256d84977025f868c2f01d3c96a Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 5 Oct 2024 21:17:46 +0700 Subject: [PATCH 019/215] fcitx5-mozc: 2.26.4220.102 -> 2.30.5544.102 --- .../tools/inputmethods/fcitx5/fcitx5-mozc.nix | 204 ++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 111 insertions(+), 97 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix index e58db09f706c..13f863478ad3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -1,129 +1,145 @@ -{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch -, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 -, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }: -let - inherit (python3Packages) python gyp six; - utdic = fetchurl { - url = "https://osdn.net/downloads/users/39/39056/mozcdic-ut-20220904.tar.bz2"; - sha256 = "sha256-pmLBCcw2Zsirzl1PjYkviRIZoyfUz5rpESeABDxuhtU="; - }; - japanese_usage_dictionary = fetchFromGitHub { - owner = "hiroyuki-komatsu"; - repo = "japanese-usage-dictionary"; - rev = "e5b3425575734c323e1d947009dd74709437b684"; - sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; - }; - zipcode_rel = "202011"; - jigyosyo = fetchurl { - url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip"; - sha256 = "j7MkNtd4+QTi91EreVig4/OV0o5y1+KIjEJBEmLK/mY="; - }; - x-ken-all = fetchurl { - url = - "https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${zipcode_rel}.zip"; - sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw="; - }; +{ + bazel_7, + buildBazelPackage, + fcitx5, + fetchFromGitHub, + gettext, + lib, + mozc, + nixosTests, + pkg-config, + python3, + unzip, +}: -in clangStdenv.mkDerivation { +buildBazelPackage { pname = "fcitx5-mozc"; - version = "2.26.4220.102"; + version = "2.30.5544.102"; src = fetchFromGitHub { owner = "fcitx"; repo = "mozc"; - rev = "1882e33b61673b66d63277f82b4c80ae4e506c10"; - sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw="; + fetchSubmodules = true; + rev = "57e67f2a25e4c0861e0e422da0c7d4c232d89fcc"; + hash = "sha256-1EZjEbMl+LRipH5gEgFpaKP8uEKPfupHmiiTNJc/T1k="; }; - nativeBuildInputs = [ gyp ninja python pkg-config qt5.wrapQtAppsHook six which unzip ]; - - buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ]; - - patches = [ - # Support linking system abseil-cpp - (fetchpatch { - url = "https://salsa.debian.org/debian/mozc/-/raw/debian/sid/debian/patches/0007-Update-src-base-absl.gyp.patch"; - sha256 = "UiS0UScDKyAusXOhc7Bg8dF8ARQQiVTylEhAOxqaZt8="; - }) + sourceRoot = "source/src"; + nativeBuildInputs = [ + gettext + pkg-config + python3 + unzip ]; - postUnpack = '' - unzip ${x-ken-all} -d $sourceRoot/src/ - unzip ${jigyosyo} -d $sourceRoot/src/ - mkdir $TMPDIR/unpack - tar xf ${utdic} -C $TMPDIR/unpack - cat $TMPDIR/unpack/mozcdic-ut-20220904/mozcdic-ut-20220904.txt >> $sourceRoot/src/data/dictionary_oss/dictionary00.txt + buildInputs = [ + mozc + fcitx5 + ]; - rmdir $sourceRoot/src/third_party/breakpad/ - ln -s ${breakpad} $sourceRoot/src/third_party/breakpad - rmdir $sourceRoot/src/third_party/gtest/ - ln -s ${gtest} $sourceRoot/src/third_party/gtest - rmdir $sourceRoot/src/third_party/gyp/ - ln -s ${gyp} $sourceRoot/src/third_party/gyp - rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ - ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary + postPatch = '' + sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' config.bzl ''; - # Copied from https://github.com/archlinux/svntogit-community/blob/packages/fcitx5-mozc/trunk/PKGBUILD - configurePhase = '' - cd src - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_libabseil=1" + bazel = bazel_7; + removeRulesCC = false; + dontAddBazelOpts = true; - # disable fcitx4 - rm unix/fcitx/fcitx.gyp + bazelFlags = [ + "--config" + "oss_linux" + "--compilation_mode" + "opt" + ]; - # gen zip code seed - PYTHONPATH="$PWD:$PYTHONPATH" python dictionary/gen_zip_code_seed.py --zip_code="x-ken-all.csv" --jigyosyo="JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt + bazelTargets = [ + "unix/fcitx5:fcitx5-mozc.so" + "unix/icons" + ]; - # use libstdc++ instead of libc++ - sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi + fetchAttrs = { + preInstall = '' + rm -rf $bazelOut/external/fcitx5 + ''; - # run gyp - python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc - ''; + sha256 = "sha256-wz2lJckr7Pu4jtoejjFv8LdjVO2+ferrS473M4jc86I="; + }; - buildPhase = '' - runHook preBuild + buildAttrs = { + installPhase = '' + runHook preInstall - python build_mozc.py build -c Release \ - server/server.gyp:mozc_server \ - gui/gui.gyp:mozc_tool \ - unix/fcitx5/fcitx5.gyp:fcitx5-mozc + install -Dm444 ../LICENSE $out/share/licenses/fcitx5-mozc/LICENSE + install -Dm444 data/installer/credits_en.html $out/share/licenses/fcitx5-mozc/Submodules - runHook postBuild - ''; + install -Dm555 bazel-bin/unix/fcitx5/fcitx5-mozc.so $out/lib/fcitx5/fcitx5-mozc.so + install -Dm444 unix/fcitx5/mozc-addon.conf $out/share/fcitx5/addon/mozc.conf + install -Dm444 unix/fcitx5/mozc.conf $out/share/fcitx5/inputmethod/mozc.conf - installPhase = '' - runHook preInstall + for pofile in unix/fcitx5/po/*.po; do + filename=$(basename $pofile) + lang=''${filename/.po/} + mofile=''${pofile/.po/.mo} + msgfmt $pofile -o $mofile + install -Dm444 $mofile $out/share/locale/$lang/LC_MESSAGES/fcitx5-mozc.mo + done - export PREFIX=$out - export _bldtype=Release - ../scripts/install_server - install -d $out/share/licenses/fcitx5-mozc - head -n 29 server/mozc_server.cc > $out/share/licenses/fcitx5-mozc/LICENSE - install -m644 data/installer/*.html $out/share/licenses/fcitx5-mozc/ - install -d $out/share/fcitx5/addon - install -d $out/share/fcitx5/inputmethod - install -d $out/lib/fcitx5 - ../scripts/install_fcitx5 + msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml + install -Dm444 unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml $out/share/metainfo/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml - runHook postInstall - ''; + cd bazel-bin/unix - preFixup = '' - wrapQtApp $out/lib/mozc/mozc_tool - ''; + unzip -o icons.zip + + # These are relative symlinks, they will always resolve to files within $out + + install -Dm444 mozc.png $out/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx_mozc.png + ln -s org.fcitx.Fcitx5.fcitx_mozc.png $out/share/icons/hicolor/128x128/apps/fcitx_mozc.png + + for svg in \ + alpha_full.svg \ + alpha_half.svg \ + direct.svg \ + hiragana.svg \ + katakana_full.svg \ + katakana_half.svg \ + outlined/dictionary.svg \ + outlined/properties.svg \ + outlined/tool.svg + do + name=$(basename -- $svg) + path=$out/share/icons/hicolor/scalable/apps + prefix=org.fcitx.Fcitx5.fcitx_mozc + + install -Dm444 $svg $path/$prefix_$name + ln -s $prefix_$name $path/fcitx_mozc_$name + done + + runHook postInstall + ''; + }; passthru.tests = { inherit (nixosTests) fcitx5; }; meta = with lib; { - description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"; + description = "Mozc - a Japanese Input Method Editor designed for multi-platform"; homepage = "https://github.com/fcitx/mozc"; - license = licenses.bsd3; - maintainers = with maintainers; [ berberman govanify ]; + license = with licenses; [ + asl20 # abseil-cpp + bsd3 # mozc, breakpad, gtest, gyp, japanese-usage-dictionary, protobuf + mit # wil + naist-2003 # IPAdic + publicDomain # src/data/test/stress_test, Okinawa dictionary + unicode-30 # src/data/unicode, breakpad + ]; + maintainers = with maintainers; [ + berberman + govanify + musjj + ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e74c2a3d98ff..afae5287db4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7478,9 +7478,7 @@ with pkgs; fcitx5-mozc = callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { }; - fcitx5-mozc-ut = callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { - mozc = mozc-ut; - }; + fcitx5-mozc-ut = fcitx5-mozc.override { mozc = mozc-ut; }; fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; From 8aea7153f3f290e5d8ab45c483e428d81423078d Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sun, 6 Oct 2024 02:52:08 +0700 Subject: [PATCH 020/215] fcitx5-mozc: coalesce inherit statements --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afae5287db4b..6e0051d43722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6525,9 +6525,7 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - inherit mozc; - - inherit mozc-ut; + inherit mozc mozc-ut; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; From 936e9a7d54554e32d72f2f3c5bf77fdeb1bf88d9 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Tue, 8 Oct 2024 21:54:51 +0700 Subject: [PATCH 021/215] {fcitx5-mozc,fcitx5-mozc-ut}: move to by-name --- pkgs/by-name/fc/fcitx5-mozc-ut/package.nix | 8 ++++++++ .../fc/fcitx5-mozc/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/fc/fcitx5-mozc-ut/package.nix rename pkgs/{tools/inputmethods/fcitx5/fcitx5-mozc.nix => by-name/fc/fcitx5-mozc/package.nix} (100%) diff --git a/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix b/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix new file mode 100644 index 000000000000..7580b0181e33 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix @@ -0,0 +1,8 @@ +{ + fcitx5-mozc, + mozc-ut, +}: + +fcitx5-mozc.override { + mozc = mozc-ut; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix rename to pkgs/by-name/fc/fcitx5-mozc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e0051d43722..147714e846fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7474,10 +7474,6 @@ with pkgs; fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; - fcitx5-mozc = callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { }; - - fcitx5-mozc-ut = fcitx5-mozc.override { mozc = mozc-ut; }; - fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { }; From b8c086008602dcac53875e89c8aa0e3b46a65d20 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:06:16 +0700 Subject: [PATCH 022/215] mozc-ut: move to by-name --- pkgs/by-name/mo/mozc-ut/package.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/mo/mozc-ut/package.nix diff --git a/pkgs/by-name/mo/mozc-ut/package.nix b/pkgs/by-name/mo/mozc-ut/package.nix new file mode 100644 index 000000000000..a758f1e8d622 --- /dev/null +++ b/pkgs/by-name/mo/mozc-ut/package.nix @@ -0,0 +1,23 @@ +{ + mozc, + mozcdic-ut-alt-cannadic, + mozcdic-ut-edict2, + mozcdic-ut-jawiki, + mozcdic-ut-neologd, + mozcdic-ut-personal-names, + mozcdic-ut-place-names, + mozcdic-ut-skk-jisyo, + mozcdic-ut-sudachidict, +}: +mozc.override { + dictionaries = [ + mozcdic-ut-alt-cannadic + mozcdic-ut-edict2 + mozcdic-ut-jawiki + mozcdic-ut-neologd + mozcdic-ut-personal-names + mozcdic-ut-place-names + mozcdic-ut-skk-jisyo + mozcdic-ut-sudachidict + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 147714e846fc..5658fc2028a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6467,17 +6467,6 @@ with pkgs; libskk = callPackage ../development/libraries/libskk { }; - mozc-ut = mozc.override { dictionaries = [ - mozcdic-ut-alt-cannadic - mozcdic-ut-edict2 - mozcdic-ut-jawiki - mozcdic-ut-neologd - mozcdic-ut-personal-names - mozcdic-ut-place-names - mozcdic-ut-skk-jisyo - mozcdic-ut-sudachidict - ]; }; - m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; From ba0f4f4fbec72cf638a6c5281607e5089941fc40 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:42:06 +0700 Subject: [PATCH 023/215] fcitx5-mozc: use cd instead of sourceRoot --- pkgs/by-name/fc/fcitx5-mozc/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-mozc/package.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix index 13f863478ad3..b455db820e84 100644 --- a/pkgs/by-name/fc/fcitx5-mozc/package.nix +++ b/pkgs/by-name/fc/fcitx5-mozc/package.nix @@ -24,8 +24,6 @@ buildBazelPackage { hash = "sha256-1EZjEbMl+LRipH5gEgFpaKP8uEKPfupHmiiTNJc/T1k="; }; - sourceRoot = "source/src"; - nativeBuildInputs = [ gettext pkg-config @@ -39,7 +37,7 @@ buildBazelPackage { ]; postPatch = '' - sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' config.bzl + sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl ''; bazel = bazel_7; @@ -66,6 +64,10 @@ buildBazelPackage { sha256 = "sha256-wz2lJckr7Pu4jtoejjFv8LdjVO2+ferrS473M4jc86I="; }; + preConfigure = '' + cd src + ''; + buildAttrs = { installPhase = '' runHook preInstall From 517425649e70b87be93da2acc62210f3c1251c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 01:43:41 +0000 Subject: [PATCH 024/215] zpaqfranz: 60.6 -> 60.7 --- pkgs/by-name/zp/zpaqfranz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 1ade403a1187..9bc55d0ffca5 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "60.6"; + version = "60.7"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-/lUczs4YrbLH7agZDyThPwtMLiSi07XMqwk0GgR/jFw="; + hash = "sha256-tlMbCHlrGPvRSqdfItdCkxLPm1LtVWcGTQMUoZTCsIg="; }; nativeBuildInputs = [ From 981689dc770aee144f4ffa5482a5b0547a2e73b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 12:53:53 +0000 Subject: [PATCH 025/215] ocamlPackages.printbox: 0.11 -> 0.12 --- pkgs/development/ocaml-modules/printbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 56d9628ebfaf..ea99dfcd81de 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "printbox"; - version = "0.11"; + version = "0.12"; minimalOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f5iTesEakULlLdDGtX+5i3vesUIbFLjcV3kJ7ZPia0Y="; + sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc="; }; nativeCheckInputs = [ mdx.bin ]; From 3c8cbd830f2ae9e66257aa0c24773be241f0d273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sat, 12 Oct 2024 12:51:06 +0200 Subject: [PATCH 026/215] babashka: 1.4.192 -> 1.12.194 --- pkgs/development/interpreters/babashka/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index f4b51b37c480..f413c47b8169 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.4.192"; + version = "1.12.194"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-uVRk1/lfOXMSp3qOdeMoAFpwJaEBxF1MYtFOv364H7Y="; + sha256 = "sha256-Dx3AANMpmCPH8Zaz8/9FRNRRhcEPnZHXQje47udwwRQ="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; @@ -37,6 +37,7 @@ let $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' $out/bin/bb '(prn "bépo àê")' | fgrep 'bépo àê' $out/bin/bb '(:out (babashka.process/sh "echo" "ä"))' | fgrep 'ä' + $out/bin/bb '(into-array [:f])' ''; postInstall = '' From ee1e5de4fa5a33b2451a816bd6ad27c762c5cc54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 12:57:20 +0000 Subject: [PATCH 027/215] ocamlPackages.mlbdd: 0.7.2 -> 0.7.3 --- pkgs/development/ocaml-modules/mlbdd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mlbdd/default.nix b/pkgs/development/ocaml-modules/mlbdd/default.nix index 0392597c2f3b..dfdd1fdc8f3f 100644 --- a/pkgs/development/ocaml-modules/mlbdd/default.nix +++ b/pkgs/development/ocaml-modules/mlbdd/default.nix @@ -7,15 +7,15 @@ buildDunePackage { pname = "mlbdd"; - version = "0.7.2"; + version = "0.7.3"; minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "arlencox"; repo = "mlbdd"; - rev = "v0.7.2"; - hash = "sha256-GRkaUL8LQDdQx9mPvlJIXatgRfen/zKt+nGLiH7Mfvs="; + rev = "v0.7.3"; + hash = "sha256-TUdgx+B5341VJsnP7iTHID7hNC+5G/I2xNM5F3mdb/A="; }; checkInputs = [ ounit ]; From 3991c08bba40f3dabbe687c7198b15c95b59caba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 09:26:06 +0000 Subject: [PATCH 028/215] ocamlPackages.gen_js_api: 1.1.2 -> 1.1.3 --- pkgs/development/ocaml-modules/gen_js_api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index 1901bfa59bfc..1c0cd9c5bdbf 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "gen_js_api"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "LexiFi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tplbnQ/1dzZq8m/ibMAkGqY8RHQRmBPHOwh0dGuZCJM="; + sha256 = "sha256-9xYSxiPKZP7U1wbnw3/FiLhF/JmTA12rlrr4jSynA3k="; }; minimalOCamlVersion = "4.11"; From 42b355a90833c1706076a03f5b263bd6141958da Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 11 Oct 2024 21:18:40 +0800 Subject: [PATCH 029/215] artalk: 2.9.0 -> 2.9.1 --- pkgs/by-name/ar/artalk/package.nix | 44 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index c56c066e2acf..96de91650e7b 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -5,34 +5,31 @@ artalk, fetchurl, installShellFiles, + versionCheckHook, stdenv, testers, nixosTests, }: buildGoModule rec { pname = "artalk"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "ArtalkJS"; repo = "artalk"; rev = "refs/tags/v${version}"; - hash = "sha256-5tUUlkGeT4kY/81EQ29M6z+JnBT4YCa8gecbV9WMuDo="; + hash = "sha256-gzagE3muNpX/dwF45p11JAN9ElsGXNFQ3fCvF1QhvdU="; }; web = fetchurl { url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz"; - hash = "sha256-Cx3fDpnl52kwILzH9BBLfsWe5qEbIl/ecJd1wJEB/Hc="; + hash = "sha256-ckKC4lErKVdJuJ+pGysmMR96a9LkrCYnWB4j6VPP8OY="; }; - CGO_ENABLED = 1; - - vendorHash = "sha256-edqmv/Q99pgnScJqCmLwjHd7uKMNPGfCSujNTUQtpLc="; + vendorHash = "sha256-oAqYQzOUjly97H5L5PQ9I2SO2KqiUVxdJA+eoPrHD6Q="; ldflags = [ "-s" "-w" - "-X github.com/ArtalkJS/Artalk/internal/config.Version=${version}" - "-X github.com/ArtalkJS/Artalk/internal/config.CommitHash=${version}" ]; preBuild = '' @@ -42,21 +39,22 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = - '' - # work around case insensitive file systems - mv $out/bin/Artalk $out/bin/artalk.tmp - mv $out/bin/artalk.tmp $out/bin/artalk - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd artalk \ - --bash <($out/bin/artalk completion bash) \ - --fish <($out/bin/artalk completion fish) \ - --zsh <($out/bin/artalk completion zsh) - ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd artalk \ + --bash <($out/bin/artalk completion bash) \ + --fish <($out/bin/artalk completion fish) \ + --zsh <($out/bin/artalk completion zsh) + ''; + + doInstallCheck = true; + + versionCheckProgramArg = "-v"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; passthru.tests = { - version = testers.testVersion { package = artalk; }; inherit (nixosTests) artalk; }; @@ -65,6 +63,10 @@ buildGoModule rec { homepage = "https://github.com/ArtalkJS/Artalk"; changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${version}"; license = lib.licenses.mit; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "artalk"; }; From 804e3cb3099bdea7886888f3f6cb5cfa7f4abfef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Oct 2024 16:00:27 +0200 Subject: [PATCH 030/215] python312Packages.dask-expr: 1.1.15 -> 1.1.16 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.15...v1.1.16 --- pkgs/development/python-modules/dask-expr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 4e9de770a193..4598356713e6 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.15"; + version = "1.1.16"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-b5nY3srMADzYZ0GYCeyUfxhJLm7E4dTbM7qrsCR9d7A="; + hash = "sha256-7c0P+UTdjyOPdj0AM38TysNdbegT6N1iKKg6Kdgu8jI="; }; postPatch = '' From 4c053e522f112bb34fa8890b7d5243f927d1b896 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Oct 2024 16:01:15 +0200 Subject: [PATCH 031/215] python312Packages.dask: 2024.9.1 -> 2024.10.0 Diff: https://github.com/dask/dask/compare/refs/tags/2024.9.1...2024.10.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index e47ced4264ab..014f8947d35b 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -39,14 +39,14 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.9.1"; + version = "2024.10.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-lbWV6qgLQ8itJsnz7ojrgfrO12+AwNe1/DJvxBo5A+Q="; + hash = "sha256-UB/LqgDRXnjJ/RjEke9eBDyVAy+Dtak7wYJB63xmDd4="; }; build-system = [ setuptools ]; From 25b14c631711e0ae9564aaf49cea6d178e5dba14 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Oct 2024 16:01:25 +0200 Subject: [PATCH 032/215] python312Packages.distributed: 2024.9.1 -> 2024.10.0 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.9.1...2024.10.0 Changelog: https://github.com/dask/distributed/releases/tag/2024.10.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 063d30ca405f..e652d8276034 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.9.1"; + version = "2024.10.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-UDfa59o+3RVN3QppoUamScdcH8XGOB+KAxArI5w7x6M="; + hash = "sha256-pdVqPzz66CueGuha66RTykrLtEGx9i6aScR+NHIYWg0="; }; postPatch = '' From a76c4c2efbbf7663505f43bb5c281467753ab0cb Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 17 Oct 2024 15:11:15 +0000 Subject: [PATCH 033/215] perlPackages.meta: init at 0.012 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1d40ccc835b..48ee3e4a7dab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15711,6 +15711,21 @@ with self; { }; }; + meta = buildPerlModule { + pname = "meta"; + version = "0.012"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/meta-0.012.tar.gz"; + hash = "sha256-Fx0J0wn4APVTTQE4tXMDmpYfEDtDaKhBC3dogzFuuFk="; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Meta-programming API"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + MetaBuilder = buildPerlModule { pname = "Meta-Builder"; version = "0.004"; From fc6f12b97848aec765ee84f0dfdc110851024316 Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Wed, 16 Oct 2024 21:49:51 -0400 Subject: [PATCH 034/215] greetd.tuigreet: add man page --- .../display-managers/greetd/tuigreet.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 11ca43c61436..39e6d482f2c0 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -1,8 +1,11 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + scdoc, +}: rustPlatform.buildRustPackage rec { pname = "tuigreet"; version = "0.9.1"; @@ -16,6 +19,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A="; + nativeBuildInputs = [ + installShellFiles + scdoc + ]; + + postInstall = '' + scdoc < contrib/man/tuigreet-1.scd > tuigreet.1 + installManPage tuigreet.1 + ''; + meta = { description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; From 88b285c01d84de82c0b2b052fd28eaf6709c2d26 Mon Sep 17 00:00:00 2001 From: phaer Date: Thu, 17 Oct 2024 18:27:37 +0200 Subject: [PATCH 035/215] nixos/virtualisation: format image-related files --- .../maintainers/scripts/ec2/amazon-image.nix | 200 +- .../scripts/openstack/openstack-image-zfs.nix | 26 +- nixos/modules/virtualisation/azure-image.nix | 14 +- .../virtualisation/digital-ocean-image.nix | 45 +- .../virtualisation/google-compute-image.nix | 15 +- nixos/modules/virtualisation/hyperv-image.nix | 10 +- nixos/modules/virtualisation/linode-image.nix | 7 +- nixos/modules/virtualisation/oci-image.nix | 12 +- nixos/modules/virtualisation/oci-options.nix | 7 +- .../modules/virtualisation/proxmox-image.nix | 310 +-- nixos/modules/virtualisation/qemu-vm.nix | 1797 +++++++++-------- .../virtualisation/virtualbox-image.nix | 197 +- 12 files changed, 1461 insertions(+), 1179 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 1b3724bfc170..9d0e7f5883e0 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -1,12 +1,23 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - inherit (lib) mkOption optionalString types versionAtLeast; + inherit (lib) + mkOption + optionalString + types + versionAtLeast + ; inherit (lib.options) literalExpression; cfg = config.amazonImage; amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; -in { +in +{ imports = [ ../../../modules/virtualisation/amazon-image.nix ]; @@ -14,11 +25,11 @@ in { # experience, which prior to 4.15 was 255. # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes config.boot.kernelParams = - let timeout = - if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" - then "4294967295" - else "255"; - in [ "nvme_core.io_timeout=${timeout}" ]; + let + timeout = + if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255"; + in + [ "nvme_core.io_timeout=${timeout}" ]; options.amazonImage = { name = mkOption { @@ -34,7 +45,7 @@ in { } ] ''; - default = []; + default = [ ]; description = '' This option lists files to be copied to fixed locations in the generated image. Glob patterns work. @@ -49,15 +60,19 @@ in { }; format = mkOption { - type = types.enum [ "raw" "qcow2" "vpc" ]; + type = types.enum [ + "raw" + "qcow2" + "vpc" + ]; default = "vpc"; description = "The image format to output"; }; }; - config.system.build.amazonImage = let - configFile = pkgs.writeText "configuration.nix" - '' + config.system.build.amazonImage = + let + configFile = pkgs.writeText "configuration.nix" '' { modulesPath, ... }: { imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; ${optionalString config.ec2.efi '' @@ -70,91 +85,102 @@ in { } ''; - zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { - inherit lib config configFile pkgs; - inherit (cfg) contents format name; + zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { + inherit + lib + config + configFile + pkgs + ; + inherit (cfg) contents format name; - includeChannel = true; + includeChannel = true; - bootSize = 1000; # 1G is the minimum EBS volume + bootSize = 1000; # 1G is the minimum EBS volume - rootSize = cfg.sizeMB; - rootPoolProperties = { - ashift = 12; - autoexpand = "on"; + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; + }; + + datasets = config.ec2.zfs.datasets; + + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" + + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '{} + | .label = $system_label + | .boot_mode = $boot_mode + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json + ''; }; - datasets = config.ec2.zfs.datasets; + extBuilder = import ../../../lib/make-disk-image.nix { + inherit + lib + config + configFile + pkgs + ; - postVM = '' - extension=''${rootDiskImage##*.} - friendlyName=$out/${cfg.name} - rootDisk="$friendlyName.root.$extension" - bootDisk="$friendlyName.boot.$extension" - mv "$rootDiskImage" "$rootDisk" - mv "$bootDiskImage" "$bootDisk" + inherit (cfg) contents format name; - mkdir -p $out/nix-support - echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products - echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + fsType = "ext4"; + partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; - ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_mode "${amiBootMode}" \ - --arg root "$rootDisk" \ - --arg boot "$bootDisk" \ - '{} - | .label = $system_label - | .boot_mode = $boot_mode - | .system = $system - | .disks.boot.logical_bytes = $boot_logical_bytes - | .disks.boot.file = $boot - | .disks.root.logical_bytes = $root_logical_bytes - | .disks.root.file = $root - ' > $out/nix-support/image-info.json - ''; - }; + diskSize = cfg.sizeMB; - extBuilder = import ../../../lib/make-disk-image.nix { - inherit lib config configFile pkgs; + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName - inherit (cfg) contents format name; + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products - fsType = "ext4"; - partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; - - diskSize = cfg.sizeMB; - - postVM = '' - extension=''${diskImage##*.} - friendlyName=$out/${cfg.name}.$extension - mv "$diskImage" "$friendlyName" - diskImage=$friendlyName - - mkdir -p $out/nix-support - echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products - - ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_mode "${amiBootMode}" \ - --arg file "$diskImage" \ - '{} - | .label = $system_label - | .boot_mode = $boot_mode - | .system = $system - | .logical_bytes = $logical_bytes - | .file = $file - | .disks.root.logical_bytes = $logical_bytes - | .disks.root.file = $file - ' > $out/nix-support/image-info.json - ''; - }; - in if config.ec2.zfs.enable then zfsBuilder else extBuilder; + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ + --arg file "$diskImage" \ + '{} + | .label = $system_label + | .boot_mode = $boot_mode + | .system = $system + | .logical_bytes = $logical_bytes + | .file = $file + | .disks.root.logical_bytes = $logical_bytes + | .disks.root.file = $file + ' > $out/nix-support/image-info.json + ''; + }; + in + if config.ec2.zfs.enable then zfsBuilder else extBuilder; meta.maintainers = with lib.maintainers; [ arianvp ]; } diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 9799f333aec0..72f123b16229 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -1,6 +1,11 @@ # nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkOption types; copyChannel = true; @@ -12,7 +17,6 @@ in ../../../modules/virtualisation/openstack-config.nix ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); - options.openstackImage = { name = mkOption { type = types.str; @@ -33,7 +37,10 @@ in }; format = mkOption { - type = types.enum [ "raw" "qcow2" ]; + type = types.enum [ + "raw" + "qcow2" + ]; default = "qcow2"; description = "The image format to output"; }; @@ -59,13 +66,12 @@ in inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - configFile = pkgs.writeText "configuration.nix" - '' - { modulesPath, ... }: { - imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; - openstack.zfs.enable = true; - } - ''; + configFile = pkgs.writeText "configuration.nix" '' + { modulesPath, ... }: { + imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; + openstack.zfs.enable = true; + } + ''; includeChannel = copyChannel; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index ecb57483cce9..1f6b2bd52c04 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -35,7 +40,12 @@ in }; vmGeneration = mkOption { - type = with types; enum [ "v1" "v2" ]; + type = + with types; + enum [ + "v1" + "v2" + ]; default = "v1"; description = '' VM Generation to use. diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix index 53791e911406..2d06c4c38fa1 100644 --- a/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/nixos/modules/virtualisation/digital-ocean-image.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -31,7 +36,10 @@ in }; virtualisation.digitalOceanImage.compressionMethod = mkOption { - type = types.enum [ "gzip" "bzip2" ]; + type = types.enum [ + "gzip" + "bzip2" + ]; default = "gzip"; example = "bzip2"; description = '' @@ -48,23 +56,32 @@ in system.build.digitalOceanImage = import ../../lib/make-disk-image.nix { name = "digital-ocean-image"; format = "qcow2"; - postVM = let - compress = { - "gzip" = "${pkgs.gzip}/bin/gzip"; - "bzip2" = "${pkgs.bzip2}/bin/bzip2"; - }.${cfg.compressionMethod}; - in '' - ${compress} $diskImage - ''; - configFile = if cfg.configFile == null - then config.virtualisation.digitalOcean.defaultConfigFile - else cfg.configFile; + postVM = + let + compress = + { + "gzip" = "${pkgs.gzip}/bin/gzip"; + "bzip2" = "${pkgs.bzip2}/bin/bzip2"; + } + .${cfg.compressionMethod}; + in + '' + ${compress} $diskImage + ''; + configFile = + if cfg.configFile == null then + config.virtualisation.digitalOcean.defaultConfigFile + else + cfg.configFile; inherit (cfg) diskSize; inherit config lib pkgs; }; }; - meta.maintainers = with maintainers; [ arianvp eamsden ]; + meta.maintainers = with maintainers; [ + arianvp + eamsden + ]; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 8e7b31b439bf..416b47b768d9 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -64,7 +69,13 @@ in system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' - PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} + PATH=$PATH:${ + with pkgs; + lib.makeBinPath [ + gnutar + gzip + ] + } pushd $out mv $diskImage disk.raw tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index eb1bbe9f3a58..d4ed256d0d91 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -1,11 +1,17 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: with lib; let cfg = config.hyperv; -in { +in +{ options = { hyperv = { baseImageSize = mkOption { diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix index 51f793ac011d..48d7f98e6abe 100644 --- a/nixos/modules/virtualisation/linode-image.nix +++ b/nixos/modules/virtualisation/linode-image.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let diff --git a/nixos/modules/virtualisation/oci-image.nix b/nixos/modules/virtualisation/oci-image.nix index 1e2b90bfd46e..b867e7ae30e7 100644 --- a/nixos/modules/virtualisation/oci-image.nix +++ b/nixos/modules/virtualisation/oci-image.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.oci; @@ -25,7 +30,10 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - path = [ pkgs.coreutils pkgs.curl ]; + path = [ + pkgs.coreutils + pkgs.curl + ]; script = '' mkdir -m 0700 -p /root/.ssh if [ -f /root/.ssh/authorized_keys ]; then diff --git a/nixos/modules/virtualisation/oci-options.nix b/nixos/modules/virtualisation/oci-options.nix index 76f3475a4281..629b651ca5ac 100644 --- a/nixos/modules/virtualisation/oci-options.nix +++ b/nixos/modules/virtualisation/oci-options.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { options = { oci = { diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index d390c78432ae..4364fbff2a83 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: with lib; @@ -54,7 +59,10 @@ with lib; ''; }; bios = mkOption { - type = types.enum [ "seabios" "ovmf" ]; + type = types.enum [ + "seabios" + "ovmf" + ]; default = "seabios"; description = '' Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI). @@ -124,8 +132,13 @@ with lib; }; }; qemuExtraConf = mkOption { - type = with types; attrsOf (oneOf [ str int ]); - default = {}; + type = + with types; + attrsOf (oneOf [ + str + int + ]); + default = { }; example = literalExpression '' { cpu = "host"; @@ -137,7 +150,12 @@ with lib; ''; }; partitionTableType = mkOption { - type = types.enum [ "efi" "hybrid" "legacy" "legacy+gpt" ]; + type = types.enum [ + "efi" + "hybrid" + "legacy" + "legacy+gpt" + ]; description = '' Partition table type to use. See make-disk-image.nix partitionTableType for details. Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'. @@ -185,142 +203,162 @@ with lib; }; }; - config = let - cfg = config.proxmox; - cfgLine = name: value: '' - ${name}: ${builtins.toString value} - ''; - virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0); - cfgFile = fileName: properties: pkgs.writeTextDir fileName '' - # generated by NixOS - ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} - #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw: - ''; - inherit (cfg) partitionTableType; - supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; - supportBios = partitionTableType == "legacy" || partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; - hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; - hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; - in { - assertions = [ - { - assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; - message = "systemd-boot requires 'ovmf' bios"; - } - { - assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf"; - message = "'efi' disk partitioning requires 'ovmf' bios"; - } - { - assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios"; - message = "'legacy' disk partitioning requires 'seabios' bios"; - } - { - assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios"; - message = "'legacy+gpt' disk partitioning requires 'seabios' bios"; - } - ]; - system.build.VMA = import ../../lib/make-disk-image.nix { - name = "proxmox-${cfg.filenameSuffix}"; - inherit (cfg) partitionTableType; - postVM = let - # Build qemu with PVE's patch that adds support for the VMA format - vma = (pkgs.qemu_kvm.override { - alsaSupport = false; - pulseSupport = false; - sdlSupport = false; - jackSupport = false; - gtkSupport = false; - vncSupport = false; - smartcardSupport = false; - spiceSupport = false; - ncursesSupport = false; - libiscsiSupport = false; - tpmSupport = false; - numaSupport = false; - seccompSupport = false; - guestAgentSupport = false; - }).overrideAttrs ( super: rec { - # Check https://github.com/proxmox/pve-qemu/tree/master for the version - # of qemu and patch to use - version = "9.0.0"; - src = pkgs.fetchurl { - url = "https://download.qemu.org/qemu-${version}.tar.xz"; - hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk="; - }; - patches = [ - # Proxmox' VMA tool is published as a particular patch upon QEMU - "${pkgs.fetchFromGitHub { - owner = "proxmox"; - repo = "pve-qemu"; - rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8"; - hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc="; - }}/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch" - ]; - - buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; - nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ]; - - }); - in - '' - ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \ - -c ${cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)}/qemu-server.conf drive-virtio0=$diskImage - rm $diskImage - ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma" - mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/ - - mkdir -p $out/nix-support - echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products + config = + let + cfg = config.proxmox; + cfgLine = name: value: '' + ${name}: ${builtins.toString value} ''; - inherit (cfg.qemuConf) additionalSpace diskSize bootSize; - format = "raw"; - inherit config lib pkgs; - }; + virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0); + cfgFile = + fileName: properties: + pkgs.writeTextDir fileName '' + # generated by NixOS + ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} + #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw: + ''; + inherit (cfg) partitionTableType; + supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; + supportBios = + partitionTableType == "legacy" + || partitionTableType == "hybrid" + || partitionTableType == "legacy+gpt"; + hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; + hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; + in + { + assertions = [ + { + assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; + message = "systemd-boot requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf"; + message = "'efi' disk partitioning requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy' disk partitioning requires 'seabios' bios"; + } + { + assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy+gpt' disk partitioning requires 'seabios' bios"; + } + ]; + system.build.VMA = import ../../lib/make-disk-image.nix { + name = "proxmox-${cfg.filenameSuffix}"; + inherit (cfg) partitionTableType; + postVM = + let + # Build qemu with PVE's patch that adds support for the VMA format + vma = + (pkgs.qemu_kvm.override { + alsaSupport = false; + pulseSupport = false; + sdlSupport = false; + jackSupport = false; + gtkSupport = false; + vncSupport = false; + smartcardSupport = false; + spiceSupport = false; + ncursesSupport = false; + libiscsiSupport = false; + tpmSupport = false; + numaSupport = false; + seccompSupport = false; + guestAgentSupport = false; + }).overrideAttrs + (super: rec { + # Check https://github.com/proxmox/pve-qemu/tree/master for the version + # of qemu and patch to use + version = "9.0.0"; + src = pkgs.fetchurl { + url = "https://download.qemu.org/qemu-${version}.tar.xz"; + hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk="; + }; + patches = [ + # Proxmox' VMA tool is published as a particular patch upon QEMU + "${ + pkgs.fetchFromGitHub { + owner = "proxmox"; + repo = "pve-qemu"; + rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8"; + hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc="; + } + }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch" + ]; - boot = { - growPartition = true; - kernelParams = [ "console=ttyS0" ]; - loader.grub = { - device = lib.mkDefault (if (hasNoFsPartition || supportBios) then - # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), - # which will be used the bootloader, do not set it as loader.grub.device. - # GRUB installation fails, unless the whole disk is selected. - "/dev/vda" - else - "nodev"); - efiSupport = lib.mkDefault supportEfi; - efiInstallAsRemovable = lib.mkDefault supportEfi; + buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; + nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ]; + + }); + in + '' + ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \ + -c ${ + cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf) + }/qemu-server.conf drive-virtio0=$diskImage + rm $diskImage + ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma" + mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/ + + mkdir -p $out/nix-support + echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products + ''; + inherit (cfg.qemuConf) additionalSpace diskSize bootSize; + format = "raw"; + inherit config lib pkgs; }; - loader.timeout = 0; - initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ]; - }; + boot = { + growPartition = true; + kernelParams = [ "console=ttyS0" ]; + loader.grub = { + device = lib.mkDefault ( + if (hasNoFsPartition || supportBios) then + # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), + # which will be used the bootloader, do not set it as loader.grub.device. + # GRUB installation fails, unless the whole disk is selected. + "/dev/vda" + else + "nodev" + ); + efiSupport = lib.mkDefault supportEfi; + efiInstallAsRemovable = lib.mkDefault supportEfi; + }; - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; - fileSystems."/boot" = lib.mkIf hasBootPartition { - device = "/dev/disk/by-label/ESP"; - fsType = "vfat"; - }; - - networking = mkIf cfg.cloudInit.enable { - hostName = mkForce ""; - useDHCP = false; - }; - - services = { - cloud-init = mkIf cfg.cloudInit.enable { - enable = true; - network.enable = true; + loader.timeout = 0; + initrd.availableKernelModules = [ + "uas" + "virtio_blk" + "virtio_pci" + ]; }; - sshd.enable = mkDefault true; - qemuGuest.enable = true; - }; - proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + fileSystems."/boot" = lib.mkIf hasBootPartition { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + + networking = mkIf cfg.cloudInit.enable { + hostName = mkForce ""; + useDHCP = false; + }; + + services = { + cloud-init = mkIf cfg.cloudInit.enable { + enable = true; + network.enable = true; + }; + sshd.enable = mkDefault true; + qemuGuest.enable = true; + }; + + proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom"; + }; } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c6084e559096..fe803c1971ca 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -4,7 +4,13 @@ # `config'. By default, the Nix store is shared read-only with the # host, which makes (re)building VMs very efficient. -{ config, lib, pkgs, options, ... }: +{ + config, + lib, + pkgs, + options, + ... +}: with lib; @@ -22,236 +28,263 @@ let consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; - driveOpts = { ... }: { + driveOpts = + { ... }: + { - options = { + options = { - file = mkOption { - type = types.str; - description = "The file image used for this drive."; - }; + file = mkOption { + type = types.str; + description = "The file image used for this drive."; + }; - driveExtraOpts = mkOption { - type = types.attrsOf types.str; - default = {}; - description = "Extra options passed to drive flag."; - }; + driveExtraOpts = mkOption { + type = types.attrsOf types.str; + default = { }; + description = "Extra options passed to drive flag."; + }; - deviceExtraOpts = mkOption { - type = types.attrsOf types.str; - default = {}; - description = "Extra options passed to device flag."; - }; + deviceExtraOpts = mkOption { + type = types.attrsOf types.str; + default = { }; + description = "Extra options passed to device flag."; + }; + + name = mkOption { + type = types.nullOr types.str; + default = null; + description = "A name for the drive. Must be unique in the drives list. Not passed to qemu."; + }; - name = mkOption { - type = types.nullOr types.str; - default = null; - description = "A name for the drive. Must be unique in the drives list. Not passed to qemu."; }; }; - }; + selectPartitionTableLayout = + { useEFIBoot, useDefaultFilesystems }: + if useDefaultFilesystems then if useEFIBoot then "efi" else "legacy" else "none"; - selectPartitionTableLayout = { useEFIBoot, useDefaultFilesystems }: - if useDefaultFilesystems then - if useEFIBoot then "efi" else "legacy" - else "none"; - - driveCmdline = idx: { file, driveExtraOpts, deviceExtraOpts, ... }: + driveCmdline = + idx: + { + file, + driveExtraOpts, + deviceExtraOpts, + ... + }: let drvId = "drive${toString idx}"; - mkKeyValue = generators.mkKeyValueDefault {} "="; + mkKeyValue = generators.mkKeyValueDefault { } "="; mkOpts = opts: concatStringsSep "," (mapAttrsToList mkKeyValue opts); - driveOpts = mkOpts (driveExtraOpts // { - index = idx; - id = drvId; - "if" = "none"; - inherit file; - }); - deviceOpts = mkOpts (deviceExtraOpts // { - drive = drvId; - }); + driveOpts = mkOpts ( + driveExtraOpts + // { + index = idx; + id = drvId; + "if" = "none"; + inherit file; + } + ); + deviceOpts = mkOpts ( + deviceExtraOpts + // { + drive = drvId; + } + ); device = if cfg.qemu.diskInterface == "scsi" then "-device lsi53c895a -device scsi-hd,${deviceOpts}" else "-device virtio-blk-pci,${deviceOpts}"; in - "-drive ${driveOpts} ${device}"; + "-drive ${driveOpts} ${device}"; drivesCmdLine = drives: concatStringsSep "\\\n " (imap1 driveCmdline drives); # Shell script to start the VM. - startVM = - '' - #! ${hostPkgs.runtimeShell} + startVM = '' + #! ${hostPkgs.runtimeShell} - export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH + export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH - set -e + set -e - # Create an empty ext4 filesystem image. A filesystem image does not - # contain a partition table but just a filesystem. - createEmptyFilesystemImage() { - local name=$1 - local size=$2 - local temp=$(mktemp) - ${qemu}/bin/qemu-img create -f raw "$temp" "$size" - ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp" - ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name" - rm "$temp" - } + # Create an empty ext4 filesystem image. A filesystem image does not + # contain a partition table but just a filesystem. + createEmptyFilesystemImage() { + local name=$1 + local size=$2 + local temp=$(mktemp) + ${qemu}/bin/qemu-img create -f raw "$temp" "$size" + ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp" + ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name" + rm "$temp" + } - NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" + NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" - if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then - echo "Disk image do not exist, creating the virtualisation disk image..." + if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then + echo "Disk image do not exist, creating the virtualisation disk image..." - ${if (cfg.useBootLoader && cfg.useDefaultFilesystems) then '' - # Create a writable qcow2 image using the systemImage as a backing - # image. + ${ + if (cfg.useBootLoader && cfg.useDefaultFilesystems) then + '' + # Create a writable qcow2 image using the systemImage as a backing + # image. - # CoW prevent size to be attributed to an image. - # FIXME: raise this issue to upstream. - ${qemu}/bin/qemu-img create \ - -f qcow2 \ - -b ${systemImage}/nixos.qcow2 \ - -F qcow2 \ - "$NIX_DISK_IMAGE" - '' else if cfg.useDefaultFilesystems then '' - createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" - '' else '' - # Create an empty disk image without a filesystem. - ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" - '' - } - echo "Virtualisation disk image created." - fi - - # Create a directory for storing temporary data of the running VM. - if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then - TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) - fi - - ${lib.optionalString (cfg.useNixStoreImage) '' - echo "Creating Nix store image..." - - ${hostPkgs.gnutar}/bin/tar --create \ - --absolute-names \ - --verbatim-files-from \ - --transform 'flags=rSh;s|/nix/store/||' \ - --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \ - --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ - | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ - --quiet \ - --force-uid=0 \ - --force-gid=0 \ - -L ${nixStoreFilesystemLabel} \ - -U eb176051-bd15-49b7-9e6b-462e0b467019 \ - -T 0 \ - --tar=f \ - "$TMPDIR"/store.img - - echo "Created Nix store image." - '' - } - - # Create a directory for exchanging data with the VM. - mkdir -p "$TMPDIR/xchg" - - ${lib.optionalString cfg.useHostCerts - '' - mkdir -p "$TMPDIR/certs" - if [ -e "$NIX_SSL_CERT_FILE" ]; then - cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt - else - echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled. - fi - ''} - - ${lib.optionalString cfg.useEFIBoot - '' - # Expose EFI variables, it's useful even when we are not using a bootloader (!). - # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence - # no guard against `useBootLoader`. Examples: - # - testing PXE boot or other EFI applications - # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows - NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}") - # VM needs writable EFI vars - if ! test -e "$NIX_EFI_VARS"; then - ${if cfg.efi.keepVariables then - # We still need the EFI var from the make-disk-image derivation - # because our "switch-to-configuration" process might - # write into it and we want to keep this data. - ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"'' - else - ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"'' - } - chmod 0644 "$NIX_EFI_VARS" - fi - ''} - - ${lib.optionalString cfg.tpm.enable '' - NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}") - mkdir -p "$NIX_SWTPM_DIR" - ${lib.getExe cfg.tpm.package} \ - socket \ - --tpmstate dir="$NIX_SWTPM_DIR" \ - --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \ - --pid file="$NIX_SWTPM_DIR"/pid --daemon \ - --tpm2 \ - --log file="$NIX_SWTPM_DIR"/stdout,level=6 - - # Enable `fdflags` builtin in Bash - # We will need it to perform surgical modification of the file descriptor - # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor - # on exec. - # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec` - # at the end of this script. To work around that, we will just clear - # the `FD_CLOEXEC` bits as a first step. - enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags - # leave a dangling subprocess because the swtpm ctrl socket has - # "terminate" when the last connection disconnects, it stops swtpm. - # When qemu stops, or if the main shell process ends, the coproc will - # get signaled by virtue of the pipe between main and coproc ending. - # Which in turns triggers a socat connect-disconnect to swtpm which - # will stop it. - coproc waitingswtpm { - read || : - echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket + # CoW prevent size to be attributed to an image. + # FIXME: raise this issue to upstream. + ${qemu}/bin/qemu-img create \ + -f qcow2 \ + -b ${systemImage}/nixos.qcow2 \ + -F qcow2 \ + "$NIX_DISK_IMAGE" + '' + else if cfg.useDefaultFilesystems then + '' + createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" + '' + else + '' + # Create an empty disk image without a filesystem. + ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" + '' } - # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin. - fdflags -s-cloexec ''${waitingswtpm[1]} - ''} + echo "Virtualisation disk image created." + fi - cd "$TMPDIR" + # Create a directory for storing temporary data of the running VM. + if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then + TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) + fi - ${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"} - ${flip concatMapStrings cfg.emptyDiskImages (size: '' - if ! test -e "empty$idx.qcow2"; then - ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" - fi - idx=$((idx + 1)) - '')} + ${lib.optionalString (cfg.useNixStoreImage) '' + echo "Creating Nix store image..." - # Start QEMU. - exec ${qemu-common.qemuBinary qemu} \ - -name ${config.system.name} \ - -m ${toString config.virtualisation.memorySize} \ - -smp ${toString config.virtualisation.cores} \ - -device virtio-rng-pci \ - ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ - ${concatStringsSep " \\\n " - (mapAttrsToList - (tag: share: "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}") - config.virtualisation.sharedDirectories)} \ - ${drivesCmdLine config.virtualisation.qemu.drives} \ - ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ - $QEMU_OPTS \ - "$@" - ''; + ${hostPkgs.gnutar}/bin/tar --create \ + --absolute-names \ + --verbatim-files-from \ + --transform 'flags=rSh;s|/nix/store/||' \ + --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \ + --files-from ${ + hostPkgs.closureInfo { + rootPaths = [ + config.system.build.toplevel + regInfo + ]; + } + }/store-paths \ + | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ + --quiet \ + --force-uid=0 \ + --force-gid=0 \ + -L ${nixStoreFilesystemLabel} \ + -U eb176051-bd15-49b7-9e6b-462e0b467019 \ + -T 0 \ + --tar=f \ + "$TMPDIR"/store.img + echo "Created Nix store image." + ''} + + # Create a directory for exchanging data with the VM. + mkdir -p "$TMPDIR/xchg" + + ${lib.optionalString cfg.useHostCerts '' + mkdir -p "$TMPDIR/certs" + if [ -e "$NIX_SSL_CERT_FILE" ]; then + cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt + else + echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled. + fi + ''} + + ${lib.optionalString cfg.useEFIBoot '' + # Expose EFI variables, it's useful even when we are not using a bootloader (!). + # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence + # no guard against `useBootLoader`. Examples: + # - testing PXE boot or other EFI applications + # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows + NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}") + # VM needs writable EFI vars + if ! test -e "$NIX_EFI_VARS"; then + ${ + if cfg.efi.keepVariables then + # We still need the EFI var from the make-disk-image derivation + # because our "switch-to-configuration" process might + # write into it and we want to keep this data. + ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"'' + else + ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"'' + } + chmod 0644 "$NIX_EFI_VARS" + fi + ''} + + ${lib.optionalString cfg.tpm.enable '' + NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}") + mkdir -p "$NIX_SWTPM_DIR" + ${lib.getExe cfg.tpm.package} \ + socket \ + --tpmstate dir="$NIX_SWTPM_DIR" \ + --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \ + --pid file="$NIX_SWTPM_DIR"/pid --daemon \ + --tpm2 \ + --log file="$NIX_SWTPM_DIR"/stdout,level=6 + + # Enable `fdflags` builtin in Bash + # We will need it to perform surgical modification of the file descriptor + # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor + # on exec. + # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec` + # at the end of this script. To work around that, we will just clear + # the `FD_CLOEXEC` bits as a first step. + enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags + # leave a dangling subprocess because the swtpm ctrl socket has + # "terminate" when the last connection disconnects, it stops swtpm. + # When qemu stops, or if the main shell process ends, the coproc will + # get signaled by virtue of the pipe between main and coproc ending. + # Which in turns triggers a socat connect-disconnect to swtpm which + # will stop it. + coproc waitingswtpm { + read || : + echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket + } + # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin. + fdflags -s-cloexec ''${waitingswtpm[1]} + ''} + + cd "$TMPDIR" + + ${lib.optionalString (cfg.emptyDiskImages != [ ]) "idx=0"} + ${flip concatMapStrings cfg.emptyDiskImages (size: '' + if ! test -e "empty$idx.qcow2"; then + ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" + fi + idx=$((idx + 1)) + '')} + + # Start QEMU. + exec ${qemu-common.qemuBinary qemu} \ + -name ${config.system.name} \ + -m ${toString config.virtualisation.memorySize} \ + -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ + ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ + ${ + concatStringsSep " \\\n " ( + mapAttrsToList ( + tag: share: + "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}" + ) config.virtualisation.sharedDirectories + ) + } \ + ${drivesCmdLine config.virtualisation.qemu.drives} \ + ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ + $QEMU_OPTS \ + "$@" + ''; regInfo = hostPkgs.closureInfo { rootPaths = config.virtualisation.additionalPaths; }; @@ -290,210 +323,242 @@ in { imports = [ ../profiles/qemu-guest.nix - (mkRenamedOptionModule [ "virtualisation" "pathsInNixDB" ] [ "virtualisation" "additionalPaths" ]) - (mkRemovedOptionModule [ "virtualisation" "bootDevice" ] "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues.") - (mkRemovedOptionModule [ "virtualisation" "efiVars" ] "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue") - (mkRemovedOptionModule [ "virtualisation" "persistBootDevice" ] "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`") + (mkRenamedOptionModule + [ + "virtualisation" + "pathsInNixDB" + ] + [ + "virtualisation" + "additionalPaths" + ] + ) + (mkRemovedOptionModule + [ + "virtualisation" + "bootDevice" + ] + "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues." + ) + (mkRemovedOptionModule + [ + "virtualisation" + "efiVars" + ] + "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue" + ) + (mkRemovedOptionModule + [ + "virtualisation" + "persistBootDevice" + ] + "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`" + ) ]; options = { virtualisation.fileSystems = options.fileSystems; - virtualisation.memorySize = - mkOption { - type = types.ints.positive; - default = 1024; - description = '' - The memory size in megabytes of the virtual machine. - ''; + virtualisation.memorySize = mkOption { + type = types.ints.positive; + default = 1024; + description = '' + The memory size in megabytes of the virtual machine. + ''; + }; + + virtualisation.msize = mkOption { + type = types.ints.positive; + default = 16384; + description = '' + The msize (maximum packet size) option passed to 9p file systems, in + bytes. Increasing this should increase performance significantly, + at the cost of higher RAM usage. + ''; + }; + + virtualisation.diskSize = mkOption { + type = types.ints.positive; + default = 1024; + description = '' + The disk size in megabytes of the virtual machine. + ''; + }; + + virtualisation.diskImage = mkOption { + type = types.nullOr types.str; + default = "./${config.system.name}.qcow2"; + defaultText = literalExpression ''"./''${config.system.name}.qcow2"''; + description = '' + Path to the disk image containing the root filesystem. + The image will be created on startup if it does not + exist. + + If null, a tmpfs will be used as the root filesystem and + the VM's state will not be persistent. + ''; + }; + + virtualisation.bootLoaderDevice = mkOption { + type = types.path; + default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; + defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; + example = "/dev/disk/by-id/virtio-boot-loader-device"; + description = '' + The path (inside th VM) to the device to boot from when legacy booting. + ''; + }; + + virtualisation.bootPartition = mkOption { + type = types.nullOr types.path; + default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null; + defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null''; + example = "/dev/disk/by-label/esp"; + description = '' + The path (inside the VM) to the device containing the EFI System Partition (ESP). + + If you are *not* booting from a UEFI firmware, this value is, by + default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`. + ''; + }; + + virtualisation.rootDevice = mkOption { + type = types.nullOr types.path; + default = "/dev/disk/by-label/${rootFilesystemLabel}"; + defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; + example = "/dev/disk/by-label/nixos"; + description = '' + The path (inside the VM) to the device containing the root filesystem. + ''; + }; + + virtualisation.emptyDiskImages = mkOption { + type = types.listOf types.ints.positive; + default = [ ]; + description = '' + Additional disk images to provide to the VM. The value is + a list of size in megabytes of each disk. These disks are + writeable by the VM. + ''; + }; + + virtualisation.graphics = mkOption { + type = types.bool; + default = true; + description = '' + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; + }; + + virtualisation.resolution = mkOption { + type = options.services.xserver.resolutions.type.nestedTypes.elemType; + default = { + x = 1024; + y = 768; }; + description = '' + The resolution of the virtual machine display. + ''; + }; - virtualisation.msize = - mkOption { - type = types.ints.positive; - default = 16384; - description = '' - The msize (maximum packet size) option passed to 9p file systems, in - bytes. Increasing this should increase performance significantly, - at the cost of higher RAM usage. - ''; - }; + virtualisation.cores = mkOption { + type = types.ints.positive; + default = 1; + description = '' + Specify the number of cores the guest is permitted to use. + The number can be higher than the available cores on the + host system. + ''; + }; - virtualisation.diskSize = - mkOption { - type = types.ints.positive; - default = 1024; - description = '' - The disk size in megabytes of the virtual machine. - ''; - }; + virtualisation.sharedDirectories = mkOption { + type = types.attrsOf ( + types.submodule { + options.source = mkOption { + type = types.str; + description = "The path of the directory to share, can be a shell variable"; + }; + options.target = mkOption { + type = types.path; + description = "The mount point of the directory inside the virtual machine"; + }; + options.securityModel = mkOption { + type = types.enum [ + "passthrough" + "mapped-xattr" + "mapped-file" + "none" + ]; + default = "mapped-xattr"; + description = '' + The security model to use for this share: - virtualisation.diskImage = - mkOption { - type = types.nullOr types.str; - default = "./${config.system.name}.qcow2"; - defaultText = literalExpression ''"./''${config.system.name}.qcow2"''; - description = '' - Path to the disk image containing the root filesystem. - The image will be created on startup if it does not - exist. - - If null, a tmpfs will be used as the root filesystem and - the VM's state will not be persistent. - ''; - }; - - virtualisation.bootLoaderDevice = - mkOption { - type = types.path; - default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; - defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; - example = "/dev/disk/by-id/virtio-boot-loader-device"; - description = '' - The path (inside th VM) to the device to boot from when legacy booting. - ''; - }; - - virtualisation.bootPartition = - mkOption { - type = types.nullOr types.path; - default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null; - defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null''; - example = "/dev/disk/by-label/esp"; - description = '' - The path (inside the VM) to the device containing the EFI System Partition (ESP). - - If you are *not* booting from a UEFI firmware, this value is, by - default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`. - ''; - }; - - virtualisation.rootDevice = - mkOption { - type = types.nullOr types.path; - default = "/dev/disk/by-label/${rootFilesystemLabel}"; - defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; - example = "/dev/disk/by-label/nixos"; - description = '' - The path (inside the VM) to the device containing the root filesystem. - ''; - }; - - virtualisation.emptyDiskImages = - mkOption { - type = types.listOf types.ints.positive; - default = []; - description = '' - Additional disk images to provide to the VM. The value is - a list of size in megabytes of each disk. These disks are - writeable by the VM. - ''; - }; - - virtualisation.graphics = - mkOption { - type = types.bool; - default = true; - description = '' - Whether to run QEMU with a graphics window, or in nographic mode. - Serial console will be enabled on both settings, but this will - change the preferred console. + - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root) + - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes + - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools + - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership ''; - }; - - virtualisation.resolution = - mkOption { - type = options.services.xserver.resolutions.type.nestedTypes.elemType; - default = { x = 1024; y = 768; }; - description = '' - The resolution of the virtual machine display. - ''; - }; - - virtualisation.cores = - mkOption { - type = types.ints.positive; - default = 1; - description = '' - Specify the number of cores the guest is permitted to use. - The number can be higher than the available cores on the - host system. - ''; - }; - - virtualisation.sharedDirectories = - mkOption { - type = types.attrsOf - (types.submodule { - options.source = mkOption { - type = types.str; - description = "The path of the directory to share, can be a shell variable"; - }; - options.target = mkOption { - type = types.path; - description = "The mount point of the directory inside the virtual machine"; - }; - options.securityModel = mkOption { - type = types.enum [ "passthrough" "mapped-xattr" "mapped-file" "none" ]; - default = "mapped-xattr"; - description = '' - The security model to use for this share: - - - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root) - - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes - - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools - - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership - ''; - }; - }); - default = { }; - example = { - my-share = { source = "/path/to/be/shared"; target = "/mnt/shared"; }; + }; + } + ); + default = { }; + example = { + my-share = { + source = "/path/to/be/shared"; + target = "/mnt/shared"; }; - description = '' - An attributes set of directories that will be shared with the - virtual machine using VirtFS (9P filesystem over VirtIO). - The attribute name will be used as the 9P mount tag. - ''; }; + description = '' + An attributes set of directories that will be shared with the + virtual machine using VirtFS (9P filesystem over VirtIO). + The attribute name will be used as the 9P mount tag. + ''; + }; - virtualisation.additionalPaths = - mkOption { - type = types.listOf types.path; - default = []; - description = '' - A list of paths whose closure should be made available to - the VM. + virtualisation.additionalPaths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of paths whose closure should be made available to + the VM. - When 9p is used, the closure is registered in the Nix - database in the VM. All other paths in the host Nix store - appear in the guest Nix store as well, but are considered - garbage (because they are not registered in the Nix - database of the guest). + When 9p is used, the closure is registered in the Nix + database in the VM. All other paths in the host Nix store + appear in the guest Nix store as well, but are considered + garbage (because they are not registered in the Nix + database of the guest). - When {option}`virtualisation.useNixStoreImage` is - set, the closure is copied to the Nix store image. - ''; - }; + When {option}`virtualisation.useNixStoreImage` is + set, the closure is copied to the Nix store image. + ''; + }; virtualisation.forwardPorts = mkOption { - type = types.listOf - (types.submodule { + type = types.listOf ( + types.submodule { options.from = mkOption { - type = types.enum [ "host" "guest" ]; + type = types.enum [ + "host" + "guest" + ]; default = "host"; description = '' - Controls the direction in which the ports are mapped: + Controls the direction in which the ports are mapped: - - `"host"` means traffic from the host ports - is forwarded to the given guest port. - - `"guest"` means traffic from the guest ports - is forwarded to the given host port. - ''; + - `"host"` means traffic from the host ports + is forwarded to the given guest port. + - `"guest"` means traffic from the guest ports + is forwarded to the given host port. + ''; }; options.proto = mkOption { - type = types.enum [ "tcp" "udp" ]; + type = types.enum [ + "tcp" + "udp" + ]; default = "tcp"; description = "The protocol to forward."; }; @@ -515,10 +580,10 @@ in type = types.port; description = "The guest port to be mapped."; }; - }); - default = []; - example = lib.literalExpression - '' + } + ); + default = [ ]; + example = lib.literalExpression '' [ # forward local port 2222 -> 22, to ssh into the VM { from = "host"; host.port = 2222; guest.port = 22; } @@ -528,122 +593,121 @@ in host.address = "127.0.0.1"; host.port = 80; } ] - ''; + ''; description = '' - When using the SLiRP user networking (default), this option allows to - forward ports to/from the host/guest. + When using the SLiRP user networking (default), this option allows to + forward ports to/from the host/guest. - ::: {.warning} - If the NixOS firewall on the virtual machine is enabled, you also - have to open the guest ports to enable the traffic between host and - guest. - ::: + ::: {.warning} + If the NixOS firewall on the virtual machine is enabled, you also + have to open the guest ports to enable the traffic between host and + guest. + ::: - ::: {.note} - Currently QEMU supports only IPv4 forwarding. - ::: - ''; + ::: {.note} + Currently QEMU supports only IPv4 forwarding. + ::: + ''; }; - virtualisation.restrictNetwork = - mkOption { - type = types.bool; - default = false; - example = true; - description = '' - If this option is enabled, the guest will be isolated, i.e. it will - not be able to contact the host and no guest IP packets will be - routed over the host to the outside. This option does not affect - any explicitly set forwarding rules. - ''; - }; + virtualisation.restrictNetwork = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If this option is enabled, the guest will be isolated, i.e. it will + not be able to contact the host and no guest IP packets will be + routed over the host to the outside. This option does not affect + any explicitly set forwarding rules. + ''; + }; - virtualisation.vlans = - mkOption { - type = types.listOf types.ints.unsigned; - default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; - example = [ 1 2 ]; - description = '' - Virtual networks to which the VM is connected. Each - number «N» in this list causes - the VM to have a virtual Ethernet interface attached to a - separate virtual network on which it will be assigned IP - address - `192.168.«N».«M»`, - where «M» is the index of this VM - in the list of VMs. - ''; - }; + virtualisation.vlans = mkOption { + type = types.listOf types.ints.unsigned; + default = if config.virtualisation.interfaces == { } then [ 1 ] else [ ]; + defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; + example = [ + 1 + 2 + ]; + description = '' + Virtual networks to which the VM is connected. Each + number «N» in this list causes + the VM to have a virtual Ethernet interface attached to a + separate virtual network on which it will be assigned IP + address + `192.168.«N».«M»`, + where «M» is the index of this VM + in the list of VMs. + ''; + }; virtualisation.interfaces = mkOption { - default = {}; + default = { }; example = { enp1s0.vlan = 1; }; description = '' Network interfaces to add to the VM. ''; - type = with types; attrsOf (submodule { - options = { - vlan = mkOption { - type = types.ints.unsigned; - description = '' - VLAN to which the network interface is connected. - ''; - }; + type = + with types; + attrsOf (submodule { + options = { + vlan = mkOption { + type = types.ints.unsigned; + description = '' + VLAN to which the network interface is connected. + ''; + }; - assignIP = mkOption { - type = types.bool; - default = false; - description = '' - Automatically assign an IP address to the network interface using the same scheme as - virtualisation.vlans. - ''; + assignIP = mkOption { + type = types.bool; + default = false; + description = '' + Automatically assign an IP address to the network interface using the same scheme as + virtualisation.vlans. + ''; + }; }; - }; - }); + }); }; - virtualisation.writableStore = - mkOption { - type = types.bool; - default = cfg.mountHostNixStore; - defaultText = literalExpression "cfg.mountHostNixStore"; - description = '' - If enabled, the Nix store in the VM is made writable by - layering an overlay filesystem on top of the host's Nix - store. + virtualisation.writableStore = mkOption { + type = types.bool; + default = cfg.mountHostNixStore; + defaultText = literalExpression "cfg.mountHostNixStore"; + description = '' + If enabled, the Nix store in the VM is made writable by + layering an overlay filesystem on top of the host's Nix + store. - By default, this is enabled if you mount a host Nix store. - ''; - }; + By default, this is enabled if you mount a host Nix store. + ''; + }; - virtualisation.writableStoreUseTmpfs = - mkOption { - type = types.bool; - default = true; - description = '' - Use a tmpfs for the writable store instead of writing to the VM's - own filesystem. - ''; - }; + virtualisation.writableStoreUseTmpfs = mkOption { + type = types.bool; + default = true; + description = '' + Use a tmpfs for the writable store instead of writing to the VM's + own filesystem. + ''; + }; - networking.primaryIPAddress = - mkOption { - type = types.str; - default = ""; - internal = true; - description = "Primary IP address used in /etc/hosts."; - }; + networking.primaryIPAddress = mkOption { + type = types.str; + default = ""; + internal = true; + description = "Primary IP address used in /etc/hosts."; + }; - networking.primaryIPv6Address = - mkOption { - type = types.str; - default = ""; - internal = true; - description = "Primary IPv6 address used in /etc/hosts."; - }; + networking.primaryIPv6Address = mkOption { + type = types.str; + default = ""; + internal = true; + description = "Primary IPv6 address used in /etc/hosts."; + }; virtualisation.host.pkgs = mkOption { type = options.nixpkgs.pkgs.type; @@ -659,31 +723,38 @@ in }; virtualisation.qemu = { - package = - mkOption { - type = types.package; - default = if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then hostPkgs.qemu_kvm else hostPkgs.qemu; - defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu"; - example = literalExpression "pkgs.qemu_test"; - description = "QEMU package to use."; - }; + package = mkOption { + type = types.package; + default = + if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then + hostPkgs.qemu_kvm + else + hostPkgs.qemu; + defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu"; + example = literalExpression "pkgs.qemu_test"; + description = "QEMU package to use."; + }; - options = - mkOption { - type = types.listOf types.str; - default = []; - example = [ "-vga std" ]; - description = '' - Options passed to QEMU. - See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list. - ''; - }; + options = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-vga std" ]; + description = '' + Options passed to QEMU. + See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list. + ''; + }; consoles = mkOption { type = types.listOf types.str; - default = let - consoles = [ "${qemu-common.qemuSerialDevice},115200n8" "tty0" ]; - in if cfg.graphics then consoles else reverseList consoles; + default = + let + consoles = [ + "${qemu-common.qemuSerialDevice},115200n8" + "tty0" + ]; + in + if cfg.graphics then consoles else reverseList consoles; example = [ "console=tty1" ]; description = '' The output console devices to pass to the kernel command line via the @@ -696,176 +767,170 @@ in ''; }; - networkingOptions = - mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ - "-net nic,netdev=user.0,model=virtio" - "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" - ]; - description = '' - Networking-related command-line options that should be passed to qemu. - The default is to use userspace networking (SLiRP). - See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details. + networkingOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + description = '' + Networking-related command-line options that should be passed to qemu. + The default is to use userspace networking (SLiRP). + See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details. - If you override this option, be advised to keep - `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example) - to keep the default runtime behaviour. - ''; - }; + If you override this option, be advised to keep + `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example) + to keep the default runtime behaviour. + ''; + }; - drives = - mkOption { - type = types.listOf (types.submodule driveOpts); - description = "Drives passed to qemu."; - }; + drives = mkOption { + type = types.listOf (types.submodule driveOpts); + description = "Drives passed to qemu."; + }; - diskInterface = - mkOption { - type = types.enum [ "virtio" "scsi" "ide" ]; - default = "virtio"; - example = "scsi"; - description = "The interface used for the virtual hard disks."; - }; + diskInterface = mkOption { + type = types.enum [ + "virtio" + "scsi" + "ide" + ]; + default = "virtio"; + example = "scsi"; + description = "The interface used for the virtual hard disks."; + }; - guestAgent.enable = - mkOption { - type = types.bool; - default = true; - description = '' - Enable the Qemu guest agent. - ''; - }; + guestAgent.enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable the Qemu guest agent. + ''; + }; - virtioKeyboard = - mkOption { - type = types.bool; - default = true; - description = '' - Enable the virtio-keyboard device. - ''; - }; + virtioKeyboard = mkOption { + type = types.bool; + default = true; + description = '' + Enable the virtio-keyboard device. + ''; + }; }; - virtualisation.useNixStoreImage = - mkOption { - type = types.bool; - default = false; - description = '' - Build and use a disk image for the Nix store, instead of - accessing the host's one through 9p. + virtualisation.useNixStoreImage = mkOption { + type = types.bool; + default = false; + description = '' + Build and use a disk image for the Nix store, instead of + accessing the host's one through 9p. - For applications which do a lot of reads from the store, - this can drastically improve performance, but at the cost of - disk space and image build time. + For applications which do a lot of reads from the store, + this can drastically improve performance, but at the cost of + disk space and image build time. - The Nix store image is built just-in-time right before the VM is - started. Because it does not produce another derivation, the image is - not cached between invocations and never lands in the store or binary - cache. + The Nix store image is built just-in-time right before the VM is + started. Because it does not produce another derivation, the image is + not cached between invocations and never lands in the store or binary + cache. - If you want a full disk image with a partition table and a root - filesystem instead of only a store image, enable - {option}`virtualisation.useBootLoader` instead. - ''; - }; + If you want a full disk image with a partition table and a root + filesystem instead of only a store image, enable + {option}`virtualisation.useBootLoader` instead. + ''; + }; - virtualisation.mountHostNixStore = - mkOption { - type = types.bool; - default = !cfg.useNixStoreImage && !cfg.useBootLoader; - defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader"; - description = '' - Mount the host Nix store as a 9p mount. - ''; - }; + virtualisation.mountHostNixStore = mkOption { + type = types.bool; + default = !cfg.useNixStoreImage && !cfg.useBootLoader; + defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader"; + description = '' + Mount the host Nix store as a 9p mount. + ''; + }; virtualisation.directBoot = { - enable = - mkOption { - type = types.bool; - default = !cfg.useBootLoader; - defaultText = "!cfg.useBootLoader"; - description = '' - If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader. - Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html) - - This is enabled by default. - If you want to test netboot, consider disabling this option. - Enable a bootloader with {option}`virtualisation.useBootLoader` if you need. - - Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU. - Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`. - They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details - For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`. - - This will not (re-)boot correctly into a system that has switched to a different configuration on disk. - ''; - }; - initrd = - mkOption { - type = types.str; - default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; - defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}"; - description = '' - In direct boot situations, you may want to influence the initrd to load - to use your own customized payload. - - This is useful if you want to test the netboot image without - testing the firmware or the loading part. - ''; - }; - }; - - virtualisation.useBootLoader = - mkOption { + enable = mkOption { type = types.bool; - default = false; + default = !cfg.useBootLoader; + defaultText = "!cfg.useBootLoader"; description = '' - Use a boot loader to boot the system. - This allows, among other things, testing the boot loader. + If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader. + Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html) - If disabled, the kernel and initrd are directly booted, - forgoing any bootloader. + This is enabled by default. + If you want to test netboot, consider disabling this option. + Enable a bootloader with {option}`virtualisation.useBootLoader` if you need. - Check the documentation on {option}`virtualisation.directBoot.enable` for details. - ''; - }; + Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU. + Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`. + They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details + For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`. - virtualisation.installBootLoader = - mkOption { - type = types.bool; - default = cfg.useBootLoader && cfg.useDefaultFilesystems; - defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems"; - description = '' - Install boot loader to target image. - - This is best-effort and may break with unconventional partition setups. - Use `virtualisation.useDefaultFilesystems` for a known-working configuration. + This will not (re-)boot correctly into a system that has switched to a different configuration on disk. ''; }; - - virtualisation.useEFIBoot = - mkOption { - type = types.bool; - default = false; + initrd = mkOption { + type = types.str; + default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}"; description = '' - If enabled, the virtual machine will provide a EFI boot - manager. - useEFIBoot is ignored if useBootLoader == false. - ''; - }; + In direct boot situations, you may want to influence the initrd to load + to use your own customized payload. + + This is useful if you want to test the netboot image without + testing the firmware or the loading part. + ''; + }; + }; + + virtualisation.useBootLoader = mkOption { + type = types.bool; + default = false; + description = '' + Use a boot loader to boot the system. + This allows, among other things, testing the boot loader. + + If disabled, the kernel and initrd are directly booted, + forgoing any bootloader. + + Check the documentation on {option}`virtualisation.directBoot.enable` for details. + ''; + }; + + virtualisation.installBootLoader = mkOption { + type = types.bool; + default = cfg.useBootLoader && cfg.useDefaultFilesystems; + defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems"; + description = '' + Install boot loader to target image. + + This is best-effort and may break with unconventional partition setups. + Use `virtualisation.useDefaultFilesystems` for a known-working configuration. + ''; + }; + + virtualisation.useEFIBoot = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, the virtual machine will provide a EFI boot + manager. + useEFIBoot is ignored if useBootLoader == false. + ''; + }; virtualisation.efi = { OVMF = mkOption { type = types.package; - default = (pkgs.OVMF.override { - secureBoot = cfg.useSecureBoot; - }).fd; - defaultText = ''(pkgs.OVMF.override { - secureBoot = cfg.useSecureBoot; - }).fd''; + default = + (pkgs.OVMF.override { + secureBoot = cfg.useSecureBoot; + }).fd; + defaultText = '' + (pkgs.OVMF.override { + secureBoot = cfg.useSecureBoot; + }).fd''; description = "OVMF firmware package, defaults to OVMF configured with secure boot if needed."; }; @@ -874,8 +939,8 @@ in default = cfg.efi.OVMF.firmware; defaultText = literalExpression "cfg.efi.OVMF.firmware"; description = '' - Firmware binary for EFI implementation, defaults to OVMF. - ''; + Firmware binary for EFI implementation, defaults to OVMF. + ''; }; variables = mkOption { @@ -883,9 +948,9 @@ in default = cfg.efi.OVMF.variables; defaultText = literalExpression "cfg.efi.OVMF.variables"; description = '' - Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. - Defaults to OVMF. - ''; + Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. + Defaults to OVMF. + ''; }; keepVariables = mkOption { @@ -903,13 +968,16 @@ in deviceModel = mkOption { type = types.str; - default = ({ - "i686-linux" = "tpm-tis"; - "x86_64-linux" = "tpm-tis"; - "ppc64-linux" = "tpm-spapr"; - "armv7-linux" = "tpm-tis-device"; - "aarch64-linux" = "tpm-tis-device"; - }.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); + default = ( + { + "i686-linux" = "tpm-tis"; + "x86_64-linux" = "tpm-tis"; + "ppc64-linux" = "tpm-spapr"; + "armv7-linux" = "tpm-tis-device"; + "aarch64-linux" = "tpm-tis-device"; + } + .${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU") + ); defaultText = '' Based on the guest platform Linux system: @@ -922,104 +990,104 @@ in }; }; - virtualisation.useDefaultFilesystems = - mkOption { - type = types.bool; - default = true; - description = '' - If enabled, the boot disk of the virtual machine will be - formatted and mounted with the default filesystems for - testing. Swap devices and LUKS will be disabled. + virtualisation.useDefaultFilesystems = mkOption { + type = types.bool; + default = true; + description = '' + If enabled, the boot disk of the virtual machine will be + formatted and mounted with the default filesystems for + testing. Swap devices and LUKS will be disabled. - If disabled, a root filesystem has to be specified and - formatted (for example in the initial ramdisk). - ''; - }; + If disabled, a root filesystem has to be specified and + formatted (for example in the initial ramdisk). + ''; + }; - virtualisation.useSecureBoot = - mkOption { - type = types.bool; - default = false; - description = '' - Enable Secure Boot support in the EFI firmware. - ''; - }; + virtualisation.useSecureBoot = mkOption { + type = types.bool; + default = false; + description = '' + Enable Secure Boot support in the EFI firmware. + ''; + }; - virtualisation.bios = - mkOption { - type = types.nullOr types.package; - default = null; - description = '' - An alternate BIOS (such as `qboot`) with which to start the VM. - Should contain a file named `bios.bin`. - If `null`, QEMU's builtin SeaBIOS will be used. - ''; - }; + virtualisation.bios = mkOption { + type = types.nullOr types.package; + default = null; + description = '' + An alternate BIOS (such as `qboot`) with which to start the VM. + Should contain a file named `bios.bin`. + If `null`, QEMU's builtin SeaBIOS will be used. + ''; + }; - virtualisation.useHostCerts = - mkOption { - type = types.bool; - default = false; - description = '' - If enabled, when `NIX_SSL_CERT_FILE` is set on the host, - pass the CA certificates from the host to the VM. - ''; - }; + virtualisation.useHostCerts = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, when `NIX_SSL_CERT_FILE` is set on the host, + pass the CA certificates from the host to the VM. + ''; + }; }; config = { assertions = - lib.concatLists (lib.flip lib.imap cfg.forwardPorts (i: rule: - [ - { assertion = rule.from == "guest" -> rule.proto == "tcp"; - message = - '' + lib.concatLists ( + lib.flip lib.imap cfg.forwardPorts ( + i: rule: [ + { + assertion = rule.from == "guest" -> rule.proto == "tcp"; + message = '' Invalid virtualisation.forwardPorts..proto: Guest forwarding supports only TCP connections. ''; - } - { assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address; - message = - '' + } + { + assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address; + message = '' Invalid virtualisation.forwardPorts..guest.address: The address must be in the default VLAN (10.0.2.0/24). ''; - } - ])) ++ [ - { assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047; - message = '' - virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. - ''; - } - { assertion = cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default; - message = - '' - You changed the default of `virtualisation.directBoot.initrd` but you are not - using QEMU direct boot. This initrd will not be used in your current - boot configuration. + } + ] + ) + ) + ++ [ + { + assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047; + message = '' + virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. + ''; + } + { + assertion = + cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default; + message = '' + You changed the default of `virtualisation.directBoot.initrd` but you are not + using QEMU direct boot. This initrd will not be used in your current + boot configuration. - Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot. + Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot. - If you have a more advanced usecase, please open an issue or a pull request. - ''; - } - { - assertion = cfg.installBootLoader -> config.system.switch.enable; - message = '' - `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work. - Please enable it in your configuration. - ''; - } - ]; + If you have a more advanced usecase, please open an issue or a pull request. + ''; + } + { + assertion = cfg.installBootLoader -> config.system.switch.enable; + message = '' + `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work. + Please enable it in your configuration. + ''; + } + ]; - warnings = - optional (cfg.directBoot.enable && cfg.useBootLoader) - '' - You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering - `useBootLoader` useless. You might want to disable one of those options. - ''; + warnings = optional (cfg.directBoot.enable && cfg.useBootLoader) '' + You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering + `useBootLoader` useless. You might want to disable one of those options. + ''; # In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs. @@ -1037,12 +1105,11 @@ in # allow `system.build.toplevel' to be included. (If we had a direct # reference to ${regInfo} here, then we would get a cyclic # dependency.) - boot.postBootCommands = lib.mkIf config.nix.enable - '' - if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then - ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} - fi - ''; + boot.postBootCommands = lib.mkIf config.nix.enable '' + if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then + ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} + fi + ''; boot.initrd.availableKernelModules = optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" @@ -1079,14 +1146,20 @@ in virtualisation.qemu.networkingOptions = let - forwardingOptions = flip concatMapStrings cfg.forwardPorts - ({ proto, from, host, guest }: - if from == "host" - then "hostfwd=${proto}:${host.address}:${toString host.port}-" + - "${guest.address}:${toString guest.port}," - else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" + - "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," - ); + forwardingOptions = flip concatMapStrings cfg.forwardPorts ( + { + proto, + from, + host, + guest, + }: + if from == "host" then + "hostfwd=${proto}:${host.address}:${toString host.port}-" + + "${guest.address}:${toString guest.port}," + else + "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" + + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," + ); restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,"; in [ @@ -1099,20 +1172,29 @@ in "-device virtio-keyboard" ]) (mkIf pkgs.stdenv.hostPlatform.isx86 [ - "-usb" "-device usb-tablet,bus=usb-bus.0" + "-usb" + "-device usb-tablet,bus=usb-bus.0" ]) (mkIf pkgs.stdenv.hostPlatform.isAarch [ - "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" - ]) - (let - alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); - # Replace all non-alphanumeric characters with underscores - sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); - in mkIf cfg.directBoot.enable [ - "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" - "-initrd ${cfg.directBoot.initrd}" - ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' + "-device virtio-gpu-pci" + "-device usb-ehci,id=usb0" + "-device usb-kbd" + "-device usb-tablet" ]) + ( + let + alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); + # Replace all non-alphanumeric characters with underscores + sanitizeShellIdent = + s: + concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); + in + mkIf cfg.directBoot.enable [ + "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" + "-initrd ${cfg.directBoot.initrd}" + ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' + ] + ) (mkIf cfg.useEFIBoot [ "-drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}" "-drive if=pflash,format=raw,unit=1,readonly=off,file=$NIX_EFI_VARS" @@ -1129,26 +1211,32 @@ in "-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0" ]) (mkIf (pkgs.stdenv.hostPlatform.isx86 && cfg.efi.OVMF.systemManagementModeRequired) [ - "-machine" "q35,smm=on" - "-global" "driver=cfi.pflash01,property=secure,value=on" + "-machine" + "q35,smm=on" + "-global" + "driver=cfi.pflash01,property=secure,value=on" ]) ]; virtualisation.qemu.drives = mkMerge [ - (mkIf (cfg.diskImage != null) [{ - name = "root"; - file = ''"$NIX_DISK_IMAGE"''; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - deviceExtraOpts.bootindex = "1"; - deviceExtraOpts.serial = rootDriveSerialAttr; - }]) - (mkIf cfg.useNixStoreImage [{ - name = "nix-store"; - file = ''"$TMPDIR"/store.img''; - deviceExtraOpts.bootindex = "2"; - driveExtraOpts.format = "raw"; - }]) + (mkIf (cfg.diskImage != null) [ + { + name = "root"; + file = ''"$NIX_DISK_IMAGE"''; + driveExtraOpts.cache = "writeback"; + driveExtraOpts.werror = "report"; + deviceExtraOpts.bootindex = "1"; + deviceExtraOpts.serial = rootDriveSerialAttr; + } + ]) + (mkIf cfg.useNixStoreImage [ + { + name = "nix-store"; + file = ''"$TMPDIR"/store.img''; + deviceExtraOpts.bootindex = "2"; + driveExtraOpts.format = "raw"; + } + ]) (imap0 (idx: _: { file = "$(pwd)/empty${toString idx}.qcow2"; driveExtraOpts.werror = "report"; @@ -1162,91 +1250,114 @@ in # override by setting `virtualisation.fileSystems = lib.mkForce { };`. fileSystems = lib.mkIf (cfg.fileSystems != { }) (mkVMOverride cfg.fileSystems); - virtualisation.fileSystems = let - mkSharedDir = tag: share: - { + virtualisation.fileSystems = + let + mkSharedDir = tag: share: { name = share.target; value.device = tag; value.fsType = "9p"; value.neededForBoot = true; - value.options = - [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" "x-systemd.requires=modprobe@9pnet_virtio.service" ] - ++ lib.optional (tag == "nix-store") "cache=loose"; + value.options = [ + "trans=virtio" + "version=9p2000.L" + "msize=${toString cfg.msize}" + "x-systemd.requires=modprobe@9pnet_virtio.service" + ] ++ lib.optional (tag == "nix-store") "cache=loose"; }; - in lib.mkMerge [ - (lib.mapAttrs' mkSharedDir cfg.sharedDirectories) - { - "/" = lib.mkIf cfg.useDefaultFilesystems (if cfg.diskImage == null then { - device = "tmpfs"; - fsType = "tmpfs"; - } else { - device = cfg.rootDevice; - fsType = "ext4"; - }); - "/tmp" = lib.mkIf config.boot.tmp.useTmpfs { - device = "tmpfs"; - fsType = "tmpfs"; - neededForBoot = true; - # Sync with systemd's tmp.mount; - options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ]; - }; - "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) (if cfg.writableStore then { - overlay = { - lowerdir = [ "/nix/.ro-store" ]; - upperdir = "/nix/.rw-store/upper"; - workdir = "/nix/.rw-store/work"; + in + lib.mkMerge [ + (lib.mapAttrs' mkSharedDir cfg.sharedDirectories) + { + "/" = lib.mkIf cfg.useDefaultFilesystems ( + if cfg.diskImage == null then + { + device = "tmpfs"; + fsType = "tmpfs"; + } + else + { + device = cfg.rootDevice; + fsType = "ext4"; + } + ); + "/tmp" = lib.mkIf config.boot.tmp.useTmpfs { + device = "tmpfs"; + fsType = "tmpfs"; + neededForBoot = true; + # Sync with systemd's tmp.mount; + options = [ + "mode=1777" + "strictatime" + "nosuid" + "nodev" + "size=${toString config.boot.tmp.tmpfsSize}" + ]; }; - } else { - device = "/nix/.ro-store"; - options = [ "bind" ]; - }); - "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { - device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; - fsType = "erofs"; - neededForBoot = true; - options = [ "ro" ]; - }; - "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { - fsType = "tmpfs"; - options = [ "mode=0755" ]; - neededForBoot = true; - }; - "${config.boot.loader.efi.efiSysMountPoint}" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { - device = cfg.bootPartition; - fsType = "vfat"; - }; - } - ]; + "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) ( + if cfg.writableStore then + { + overlay = { + lowerdir = [ "/nix/.ro-store" ]; + upperdir = "/nix/.rw-store/upper"; + workdir = "/nix/.rw-store/work"; + }; + } + else + { + device = "/nix/.ro-store"; + options = [ "bind" ]; + } + ); + "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { + device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; + fsType = "erofs"; + neededForBoot = true; + options = [ "ro" ]; + }; + "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { + fsType = "tmpfs"; + options = [ "mode=0755" ]; + neededForBoot = true; + }; + "${config.boot.loader.efi.efiSysMountPoint}" = + lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) + { + device = cfg.bootPartition; + fsType = "vfat"; + }; + } + ]; swapDevices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) [ ]; - boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) {}; + boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) { }; # Don't run ntpd in the guest. It should get the correct time from KVM. services.timesyncd.enable = false; services.qemuGuest.enable = cfg.qemu.guestAgent.enable; - system.build.vm = hostPkgs.runCommand "nixos-vm" { - preferLocalBuild = true; - meta.mainProgram = "run-${config.system.name}-vm"; - } - '' - mkdir -p $out/bin - ln -s ${config.system.build.toplevel} $out/system - ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm - ''; + system.build.vm = + hostPkgs.runCommand "nixos-vm" + { + preferLocalBuild = true; + meta.mainProgram = "run-${config.system.name}-vm"; + } + '' + mkdir -p $out/bin + ln -s ${config.system.build.toplevel} $out/system + ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm + ''; # When building a regular system configuration, override whatever # video driver the host uses. services.xserver.videoDrivers = mkVMOverride [ "modesetting" ]; services.xserver.defaultDepth = mkVMOverride 0; services.xserver.resolutions = mkVMOverride [ cfg.resolution ]; - services.xserver.monitorSection = - '' - # Set a higher refresh rate so that resolutions > 800x600 work. - HorizSync 30-140 - VertRefresh 50-160 - ''; + services.xserver.monitorSection = '' + # Set a higher refresh rate so that resolutions > 800x600 work. + HorizSync 30-140 + VertRefresh 50-160 + ''; # Wireless won't work in the VM. networking.wireless.enable = mkVMOverride false; @@ -1257,8 +1368,10 @@ in networking.usePredictableInterfaceNames = false; - system.requiredKernelConfig = with config.lib.kernelConfig; - [ (isEnabled "VIRTIO_BLK") + system.requiredKernelConfig = + with config.lib.kernelConfig; + [ + (isEnabled "VIRTIO_BLK") (isEnabled "VIRTIO_PCI") (isEnabled "VIRTIO_NET") (isEnabled "EXT4_FS") @@ -1270,10 +1383,12 @@ in (isYes "NET_CORE") (isYes "INET") (isYes "NETWORK_FILESYSTEMS") - ] ++ optionals (!cfg.graphics) [ + ] + ++ optionals (!cfg.graphics) [ (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") - ] ++ optionals (cfg.writableStore) [ + ] + ++ optionals (cfg.writableStore) [ (isEnabled "OVERLAY_FS") ]; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 4ab5d17ecd49..968f5b766e87 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -1,9 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualbox; -in { +in +{ options = { virtualbox = { @@ -51,7 +57,14 @@ in { ''; }; params = lib.mkOption { - type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); + type = + with lib.types; + attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); example = { audio = "alsa"; rtcuseutc = "on"; @@ -64,11 +77,21 @@ in { ''; }; exportParams = lib.mkOption { - type = with lib.types; listOf (oneOf [ str int bool (listOf str) ]); + type = + with lib.types; + listOf (oneOf [ + str + int + bool + (listOf str) + ]); example = [ - "--vsys" "0" "--vendor" "ACME Inc." + "--vsys" + "0" + "--vendor" + "ACME Inc." ]; - default = []; + default = [ ]; description = '' Parameters passed to the Virtualbox export command. @@ -86,23 +109,25 @@ in { mountPoint = "/home/demo/storage"; size = 100 * 1024; }; - type = lib.types.nullOr (lib.types.submodule { - options = { - size = lib.mkOption { - type = lib.types.int; - description = "Size in MiB"; + type = lib.types.nullOr ( + lib.types.submodule { + options = { + size = lib.mkOption { + type = lib.types.int; + description = "Size in MiB"; + }; + label = lib.mkOption { + type = lib.types.str; + default = "vm-extra-storage"; + description = "Label for the disk partition"; + }; + mountPoint = lib.mkOption { + type = lib.types.str; + description = "Path where to mount this disk."; + }; }; - label = lib.mkOption { - type = lib.types.str; - default = "vm-extra-storage"; - description = "Label for the disk partition"; - }; - mountPoint = lib.mkOption { - type = lib.types.str; - description = "Path where to mount this disk."; - }; - }; - }); + } + ); }; postExportCommands = lib.mkOption { type = lib.types.lines; @@ -122,7 +147,14 @@ in { ''; }; storageController = lib.mkOption { - type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); + type = + with lib.types; + attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); example = { name = "SCSI"; add = "scsi"; @@ -175,77 +207,80 @@ in { diskSize = cfg.baseImageSize; additionalSpace = "${toString cfg.baseImageFreeSpace}M"; - postVM = - '' - export HOME=$PWD - export PATH=${pkgs.virtualbox}/bin:$PATH + postVM = '' + export HOME=$PWD + export PATH=${pkgs.virtualbox}/bin:$PATH - echo "converting image to VirtualBox format..." - VBoxManage convertfromraw $diskImage disk.vdi + echo "converting image to VirtualBox format..." + VBoxManage convertfromraw $diskImage disk.vdi - ${lib.optionalString (cfg.extraDisk != null) '' - echo "creating extra disk: data-disk.raw" - dataDiskImage=data-disk.raw - truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage + ${lib.optionalString (cfg.extraDisk != null) '' + echo "creating extra disk: data-disk.raw" + dataDiskImage=data-disk.raw + truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage - parted --script $dataDiskImage -- \ - mklabel msdos \ - mkpart primary ext4 1MiB -1 - eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) - mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K - echo "creating extra disk: data-disk.vdi" - VBoxManage convertfromraw $dataDiskImage data-disk.vdi - ''} + parted --script $dataDiskImage -- \ + mklabel msdos \ + mkpart primary ext4 1MiB -1 + eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) + mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + echo "creating extra disk: data-disk.vdi" + VBoxManage convertfromraw $dataDiskImage data-disk.vdi + ''} - echo "creating VirtualBox VM..." - vmName="${cfg.vmName}"; - VBoxManage createvm --name "$vmName" --register \ - --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"} - VBoxManage modifyvm "$vmName" \ - --memory ${toString cfg.memorySize} \ - ${lib.cli.toGNUCommandLineShell { } cfg.params} - VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} - VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ - --medium disk.vdi - ${lib.optionalString (cfg.extraDisk != null) '' - VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ - --medium data-disk.vdi - ''} + echo "creating VirtualBox VM..." + vmName="${cfg.vmName}"; + VBoxManage createvm --name "$vmName" --register \ + --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"} + VBoxManage modifyvm "$vmName" \ + --memory ${toString cfg.memorySize} \ + ${lib.cli.toGNUCommandLineShell { } cfg.params} + VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ + --medium disk.vdi + ${lib.optionalString (cfg.extraDisk != null) '' + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ + --medium data-disk.vdi + ''} - echo "exporting VirtualBox VM..." - mkdir -p $out - fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams} - ${cfg.postExportCommands} + echo "exporting VirtualBox VM..." + mkdir -p $out + fn="$out/${cfg.vmFileName}" + VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams} + ${cfg.postExportCommands} - rm -v $diskImage + rm -v $diskImage - mkdir -p $out/nix-support - echo "file ova $fn" >> $out/nix-support/hydra-build-products - ''; + mkdir -p $out/nix-support + echo "file ova $fn" >> $out/nix-support/hydra-build-products + ''; }; - fileSystems = { - "/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; - } // (lib.optionalAttrs (cfg.extraDisk != null) { - ${cfg.extraDisk.mountPoint} = { - device = "/dev/disk/by-label/" + cfg.extraDisk.label; - autoResize = true; - fsType = "ext4"; - }; - }); + fileSystems = + { + "/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + } + // (lib.optionalAttrs (cfg.extraDisk != null) { + ${cfg.extraDisk.mountPoint} = { + device = "/dev/disk/by-label/" + cfg.extraDisk.label; + autoResize = true; + fsType = "ext4"; + }; + }); boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; - swapDevices = [{ - device = "/var/swap"; - size = 2048; - }]; + swapDevices = [ + { + device = "/var/swap"; + size = 2048; + } + ]; virtualisation.virtualbox.guest.enable = true; From 6071ee8e31ae3c51dee1204efa14ae0b1999f40d Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 18 Oct 2024 13:34:12 +0200 Subject: [PATCH 036/215] .git-blame-ignore-revs: add image files formatting --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4714b843f203..4e0fe65ed3c5 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -189,3 +189,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b # percona: apply nixfmt 8d14fa2886fec877690c6d28cfcdba4503dbbcea + +# nixos/virtualisation: format image-related files +88b285c01d84de82c0b2b052fd28eaf6709c2d26 From ad01adae67f8e5f2111ffb6f15288c0e8468d18d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 19 Oct 2024 16:26:17 +0200 Subject: [PATCH 037/215] tuifimanager: 4.1.7 -> 5.0.0 --- pkgs/by-name/tu/tuifimanager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 26b30a477da0..7d2a68badb69 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -19,14 +19,14 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) python3.pkgs.buildPythonApplication rec { pname = "tuifimanager"; - version = "4.1.7"; + version = "5.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; rev = "v.${version}"; - hash = "sha256-kljodLSSjvGcjhD7IhAVAAGd6LoiM6IYwMXuSsIJ198="; + hash = "sha256-2yYD1YFGoN0uj3HzcYxEs3zbwfUIDLLzvfTcZILx5h4="; }; nativeBuildInputs = [ From c687c5fe4c5d6bf0de94a3c16cfe6c1d79ffba4a Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 20 Oct 2024 12:40:34 +0800 Subject: [PATCH 038/215] journalist: 1.0.0-unstable-2024-06-15 -> 1.0.1 --- pkgs/by-name/jo/journalist/package.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/jo/journalist/package.nix b/pkgs/by-name/jo/journalist/package.nix index 6e43151092a0..9c5e9a9fc42c 100644 --- a/pkgs/by-name/jo/journalist/package.nix +++ b/pkgs/by-name/jo/journalist/package.nix @@ -1,34 +1,21 @@ { lib, buildGoModule, - fetchpatch, fetchFromGitHub, }: buildGoModule rec { pname = "journalist"; - version = "1.0.0-unstable-2024-06-15"; + version = "1.0.1"; src = fetchFromGitHub { owner = "mrusme"; repo = "journalist"; - rev = "93781b1278e271995769f576b74fee794a19de14"; - hash = "sha256-RRo9AEaHJPzN9+oW5kIBUNCPVdFkY2USOIZeUts8P/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-3MnkndG2c4P3oprIRbzj26oAutEmAgsUx8mjlaDLrkI="; }; - overrideModAttrs = _oldAttrs: { - patches = [ - # fix go.sum by adding missing module - # see https://github.com/mrusme/journalist/pull/18 - (fetchpatch { - name = "fix-go-sum.patch"; - url = "https://github.com/mrusme/journalist/commit/546585222993586057a12ab4e9b38000c537f6cf.patch"; - hash = "sha256-+QZhP/Har5UVi1pvqB6wWY0+xKqP0B8QukCcNlGkqxQ="; - }) - ]; - }; - - vendorHash = "sha256-fEHVc9kRbeeXICWhJshLp9JK/ICBR/RB5SVChJzSXpI="; + vendorHash = "sha256-2EJ96dhhU7FZxMkHOmQo79WCHu8U1AGgFf47FIuQdek=s"; ldflags = [ "-s" @@ -39,6 +26,7 @@ buildGoModule rec { meta = { description = "RSS aggregator"; homepage = "https://github.com/mrusme/journalist"; + changelog = "https://github.com/mrusme/journalist/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "journalist"; From e29134d8f6a5f9ff2e4264e42b12abd64d38baeb Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 20 Oct 2024 16:06:04 +0800 Subject: [PATCH 039/215] python312Packages.basemap-data-hires: init at 1.4.1 --- .../basemap-data-hires/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/basemap-data-hires/default.nix diff --git a/pkgs/development/python-modules/basemap-data-hires/default.nix b/pkgs/development/python-modules/basemap-data-hires/default.nix new file mode 100644 index 000000000000..44d352a8822a --- /dev/null +++ b/pkgs/development/python-modules/basemap-data-hires/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + setuptools, + basemap, +}: + +buildPythonPackage rec { + pname = "basemap-data-hires"; + pyproject = true; + inherit (basemap) version src; + + sourceRoot = "${src.name}/packages/basemap_data_hires"; + + build-system = [ + setuptools + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "mpl_toolkits.basemap_data" ]; + + meta = { + homepage = "https://matplotlib.org/basemap/"; + description = "High-resolution data assets for matplotlib basemap"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4ce7eebdcc..922786dff255 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1476,6 +1476,8 @@ self: super: with self; { basemap-data = callPackage ../development/python-modules/basemap-data { }; + basemap-data-hires = callPackage ../development/python-modules/basemap-data-hires { }; + bases = callPackage ../development/python-modules/bases { }; bash-kernel = callPackage ../development/python-modules/bash-kernel { }; From 5577994ed4b1ea4dc9b2e48dabd5a86af3e62af1 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 20 Oct 2024 18:05:04 +0800 Subject: [PATCH 040/215] nhost-cli: 1.24.0 -> 1.24.5 --- pkgs/by-name/nh/nhost-cli/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index 6d6dbbd29528..8e36a02cb269 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.24.0"; + version = "1.24.5"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8kul3tiwEJF6Pu1os29MteeYP+85X9hH12MojMpW9bY="; + hash = "sha256-/NkegGp+JoJWPIkO3YKp/aZ6Yp5tcjnRCONY0GHe+HI="; }; vendorHash = null; @@ -27,9 +27,12 @@ buildGoModule rec { mv $out/bin/cli $out/bin/nhost ''; + checkFlags = [ "-skip=^TestMakeJSONRequest$" ]; + meta = { - description = "A tool for setting up a local development environment for Nhost"; + description = "Tool for setting up a local development environment for Nhost"; homepage = "https://github.com/nhost/cli"; + changelog = "https://github.com/nhost/cli/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "nhost"; From c3a8a2ad62f19366ae8d8f04cb8d4c8a03413f77 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 20:19:03 +0300 Subject: [PATCH 041/215] python311Packages.pyct: modernize --- .../python-modules/pyct/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 5509173bd985..9a752750945d 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -2,17 +2,24 @@ lib, buildPythonPackage, fetchPypi, - param, - pytestCheckHook, pythonAtLeast, + + # build-system + setuptools, + + # dependencies + param, pyyaml, requests, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "pyct"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonAtLeast "3.12"; @@ -21,22 +28,28 @@ buildPythonPackage rec { hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ param pyyaml requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "pyct" ]; - meta = with lib; { + meta = { description = "ClI for Python common tasks for users"; mainProgram = "pyct"; homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From b453927e0134dc50daaeb359a39416ae43a63566 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 20:19:47 +0300 Subject: [PATCH 042/215] python312Packages.pyct: enable --- pkgs/development/python-modules/pyct/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 9a752750945d..96aad663367f 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA="; @@ -41,6 +39,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Only the command line doesn't work on with Python 3.12, due to usage of + # deprecated distutils module. Not disabling it totally. + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "pyct/tests/test_cmd.py" + ]; pythonImportsCheck = [ "pyct" ]; From e0490b14aebb8cbd64dca91d291551269241f675 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 21:00:03 +0300 Subject: [PATCH 043/215] python312Packages.hvplot: 0.10.0 -> 0.11.1 Changelog: https://github.com/holoviz/hvplot/releases/tag/v0.11.1 --- pkgs/development/python-modules/hvplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 7884f61cbcb6..e266c2d8f098 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.10.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; + hash = "sha256-mJ7QOJGJrcR+3NJgHS6rGL82bnSwf14oc+AhMjxKFLs="; }; build-system = [ setuptools-scm ]; From 1cd19c7ac46711ba34c33a9417b8d536c093c792 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 22:21:50 +0300 Subject: [PATCH 044/215] python312Packages.holoview: order inputs; no with lib; in meta --- .../development/python-modules/holoviews/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index eb17dd053400..51f7dbeedabd 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,15 +1,19 @@ { lib, buildPythonPackage, - colorcet, fetchPypi, + pythonOlder, + + # build-system hatch-vcs, hatchling, + + # dependencies + colorcet, numpy, pandas, panel, param, - pythonOlder, pyviz-comms, }: @@ -44,11 +48,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "holoviews" ]; - meta = with lib; { + meta = { description = "Python data analysis and visualization seamless and simple"; mainProgram = "holoviews"; homepage = "https://www.holoviews.org/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 45d55e1d2086536191acb4c7005b1011b7f948fd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 22:22:21 +0300 Subject: [PATCH 045/215] python312Packages.holoview: enable tests --- .../python-modules/holoviews/default.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 51f7dbeedabd..5f1963bcdc38 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,6 +15,11 @@ panel, param, pyviz-comms, + + # tests + pytestCheckHook, + pytest-cov, + flaky, }: buildPythonPackage rec { @@ -43,8 +48,24 @@ buildPythonPackage rec { pyviz-comms ]; - # tests not fully included with pypi release - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + flaky + ]; + + disabledTests = [ + # All the below fail due to some change in flaky API + "test_periodic_param_fn_non_blocking" + "test_callback_cleanup" + "test_poly_edit_callback" + "test_launch_server_with_complex_plot" + "test_launch_server_with_stream" + "test_launch_simple_server" + "test_server_dynamicmap_with_dims" + "test_server_dynamicmap_with_stream" + "test_server_dynamicmap_with_stream_dims" + ]; pythonImportsCheck = [ "holoviews" ]; From 84cdacd319e469aa7db108c092c3b78adddaa4a7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 22:24:35 +0300 Subject: [PATCH 046/215] python312Packages.hvplot: order inputs; no with lib; in meta --- .../python-modules/hvplot/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index e266c2d8f098..39d0b08c52b6 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -1,13 +1,17 @@ { lib, - bokeh, buildPythonPackage, - colorcet, fetchPypi, + pythonOlder, + + # build-system + setuptools-scm, + + # dependencies + bokeh, + colorcet, holoviews, pandas, - pythonOlder, - setuptools-scm, }: buildPythonPackage rec { @@ -22,7 +26,9 @@ buildPythonPackage rec { hash = "sha256-mJ7QOJGJrcR+3NJgHS6rGL82bnSwf14oc+AhMjxKFLs="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; dependencies = [ bokeh @@ -36,11 +42,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "hvplot.pandas" ]; - meta = with lib; { + meta = { description = "High-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From 72ddbd5caeb228e53a7c0018aee828c594139f60 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 22:41:05 +0300 Subject: [PATCH 047/215] python31{1,2}Packages.bokeh-sampledata: init at 2024.2 --- .../bokeh-sampledata/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/bokeh-sampledata/default.nix diff --git a/pkgs/development/python-modules/bokeh-sampledata/default.nix b/pkgs/development/python-modules/bokeh-sampledata/default.nix new file mode 100644 index 000000000000..e4bba2b69f1c --- /dev/null +++ b/pkgs/development/python-modules/bokeh-sampledata/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + setuptools-git-versioning, + + # dependencies + icalendar, + pandas, +}: + +buildPythonPackage rec { + pname = "bokeh-sampledata"; + version = "2024.2"; + pyproject = true; + + src = fetchPypi { + pname = "bokeh_sampledata"; + inherit version; + hash = "sha256-5j2qluedVj7IuE8gZy/+lPkFshRV+rjYPuM05G2jNiQ="; + }; + + build-system = [ + setuptools + setuptools-git-versioning + ]; + + dependencies = [ + icalendar + pandas + ]; + + pythonImportsCheck = [ + "bokeh_sampledata" + ]; + + meta = { + description = "Sample datasets for Bokeh examples"; + homepage = "https://pypi.org/project/bokeh-sampledata"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4ce7eebdcc..bda968196ccd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1753,6 +1753,8 @@ self: super: with self; { bokeh = callPackage ../development/python-modules/bokeh { }; + bokeh-sampledata = callPackage ../development/python-modules/bokeh-sampledata { }; + boltons = callPackage ../development/python-modules/boltons { }; boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; From 3b43bfd340ad531bcc14b60cf3ae1321c252cf5c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 22:51:38 +0300 Subject: [PATCH 048/215] python31{1,2}Packages.hvplot: enable (most) tests --- .../python-modules/hvplot/default.nix | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 39d0b08c52b6..4831f14335c0 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -12,6 +12,17 @@ colorcet, holoviews, pandas, + + # tests + pytestCheckHook, + dask, + xarray, + bokeh-sampledata, + parameterized, + selenium, + matplotlib, + scipy, + plotly, }: buildPythonPackage rec { @@ -37,8 +48,26 @@ buildPythonPackage rec { pandas ]; - # Many tests require a network connection - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + dask + xarray + bokeh-sampledata + parameterized + selenium + matplotlib + scipy + plotly + ]; + + disabledTestPaths = [ + # All of the following below require xarray.tutorial files that require + # downloading files from the internet (not possible in the sandbox). + "hvplot/tests/testgeo.py" + "hvplot/tests/testinteractive.py" + "hvplot/tests/testui.py" + "hvplot/tests/testutil.py" + ]; pythonImportsCheck = [ "hvplot.pandas" ]; From 4575253c0c91aabd3bde5b05e9a13ce37880e6e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 04:51:48 +0000 Subject: [PATCH 049/215] camunda-modeler: 5.26.0 -> 5.28.0 --- pkgs/applications/misc/camunda-modeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index 3dce538aa007..0972247271a8 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.26.0"; + version = "5.28.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-jtTlqVsd+EGBkh05O+fRn6e6Q+Gw68uGruQqaTfsolM="; + hash = "sha256-0xOgnpHoFxBzDoDGI7bcBFRu47HDYASIu4ApQo288Bo="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; From 7fad2c2e395784739c2ced5f9e3836583bb17f30 Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 21 Oct 2024 14:41:16 +0200 Subject: [PATCH 050/215] nixos/wrappers: add enable switch Add enable switch to make it possible to disable all wrappers but then also re-enable all at once by forcing the option to be true. By default the wrappers are enabled and thus the default behaviour doesn't change. --- nixos/modules/security/wrappers/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index b5dae96d79c6..86e86585e405 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -165,6 +165,10 @@ in ###### interface options = { + security.enableWrappers = lib.mkEnableOption "SUID/SGID wrappers" // { + default = true; + }; + security.wrappers = lib.mkOption { type = lib.types.attrsOf wrapperType; default = {}; @@ -227,7 +231,7 @@ in }; ###### implementation - config = { + config = lib.mkIf config.security.enableWrappers { assertions = lib.mapAttrsToList (name: opts: From 4225f640ef7a92272a9bf3ca7f264651ce512123 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Fri, 18 Oct 2024 15:44:42 -0400 Subject: [PATCH 051/215] remctl: init at 3.18 --- pkgs/by-name/re/remctl/package.nix | 62 ++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/re/remctl/package.nix diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix new file mode 100644 index 000000000000..b354440de81a --- /dev/null +++ b/pkgs/by-name/re/remctl/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libevent, + krb5, + openssl, + perl, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "remctl"; + version = "3.18"; + + src = fetchFromGitHub { + owner = "rra"; + repo = "remctl"; + rev = "release/${finalAttrs.version}"; + hash = "sha256-4KzNhFswNTwcXrDBAfRyr502zwRQ3FACV8gDfBm7M0A="; + }; + + # Fix references to /usr/bin/perl in tests and + # disable acl/localgroup test that does not work in sandbox. + postPatch = '' + patchShebangs tests + sed -i '\,server/acl/localgroup,d' tests/TESTS + ''; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + krb5 + libevent + openssl + ]; + + # Invokes pod2man to create man pages required by Makefile. + preConfigure = '' + ./bootstrap + ''; + + makeFlags = [ + "LD=$(CC)" + "REMCTL_PERL_FLAGS='--prefix=$(out)'" + "REMCTL_PYTHON_INSTALL='--prefix=$(out)'" + ]; + + checkTarget = "check-local"; + + meta = with lib; { + description = "Remote execution tool"; + homepage = "https://www.eyrie.org/~eagle/software/remctl"; + mainProgram = "remctl"; + license = licenses.mit; + maintainers = teams.deshaw.members; + }; +}) From b34590bec59d39e3bb4421dfbdca7addde290988 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Fri, 18 Oct 2024 15:45:48 -0400 Subject: [PATCH 052/215] perlPackages.NetRemctl: init at 3.18 --- .../perl-modules/NetRemctl/default.nix | 20 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/perl-modules/NetRemctl/default.nix diff --git a/pkgs/development/perl-modules/NetRemctl/default.nix b/pkgs/development/perl-modules/NetRemctl/default.nix new file mode 100644 index 000000000000..78ee5dfdffcb --- /dev/null +++ b/pkgs/development/perl-modules/NetRemctl/default.nix @@ -0,0 +1,20 @@ +{ + buildPerlModule, + remctl, + TestPod, +}: + +buildPerlModule { + pname = "NetRemctl"; + + inherit (remctl) meta src version; + + postPatch = '' + cp -R tests/tap/perl/Test perl/t/lib + cd perl + ''; + + buildInputs = [ remctl ]; + + checkInputs = [ TestPod ]; +} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1d40ccc835b..8235d8fca93c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19100,6 +19100,8 @@ with self; { }; }; + NetRemctl = callPackage ../development/perl-modules/NetRemctl { }; + NetServer = buildPerlPackage { pname = "Net-Server"; version = "2.014"; From 100bad6ad37495d85c69b2b1e8cba48a8a16d16e Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Fri, 18 Oct 2024 15:47:39 -0400 Subject: [PATCH 053/215] python312Packages.remctl: init at 3.18 --- .../python-modules/remctl/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/remctl/default.nix diff --git a/pkgs/development/python-modules/remctl/default.nix b/pkgs/development/python-modules/remctl/default.nix new file mode 100644 index 000000000000..3e672e9e56d2 --- /dev/null +++ b/pkgs/development/python-modules/remctl/default.nix @@ -0,0 +1,21 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + remctl-c, # remctl from pkgs, not from pythonPackages + typing, +}: + +buildPythonPackage { + inherit (remctl-c) + meta + pname + src + version + ; + setSourceRoot = "sourceRoot=$(echo */python)"; + + buildInputs = [ remctl-c ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.5") [ typing ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e947b31d60cd..7df6e6e7a9eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13552,6 +13552,10 @@ self: super: with self; { remarshal = callPackage ../development/python-modules/remarshal { }; + remctl = callPackage ../development/python-modules/remctl { + remctl-c = pkgs.remctl; + }; + remi = callPackage ../development/python-modules/remi { }; remote-pdb = callPackage ../development/python-modules/remote-pdb { }; From 24be165be331e1c53266d60aed3c75bdb23d348b Mon Sep 17 00:00:00 2001 From: Pablo Andres Dealbera Date: Mon, 21 Oct 2024 12:34:15 -0300 Subject: [PATCH 054/215] nixos/bazarr: add 156 as a valid SuccessExitStatus --- nixos/modules/services/misc/bazarr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/bazarr.nix b/nixos/modules/services/misc/bazarr.nix index 76a26c2ebbf0..f7b7c8f528e3 100644 --- a/nixos/modules/services/misc/bazarr.nix +++ b/nixos/modules/services/misc/bazarr.nix @@ -56,6 +56,7 @@ in ''; Restart = "on-failure"; KillSignal = "SIGINT"; + SuccessExitStatus = "0 156"; }; }; From 719826732913d4b3102ea00066aba59fbdb35756 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 21 Oct 2024 12:27:43 -0400 Subject: [PATCH 055/215] freerdp3: 3.8.0 -> 3.9.0 --- pkgs/applications/networking/remote/freerdp/3.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index 49b412bf7663..4355fef220c5 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -71,24 +71,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-zqqPfAXHjY4IV18mgbNxWDw7ZP/7SvoYn1u0FahpcNk="; + hash = "sha256-oThlqUpEmhcLpMMYExMA3GbtB2+lq6oc5TRZt0eKRLA="; }; - patches = [ - (fetchpatch { - name = "clang-fix-unwind-getlanguagespecificdata.patch"; - url = "https://github.com/FreeRDP/FreeRDP/commit/6fb7bfd043d159d3819486fb601b598102cca823.patch"; - hash = "sha256-U2Oz+IVvlIdg7kJ4rgAWhJVdzthY50YaCYKMMc2he7Y="; - }) - ]; - - postPatch = '' export HOME=$TMP From 733184ca8a96a32e54ea7ed4656551fb6d6ae315 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:26:51 +0200 Subject: [PATCH 056/215] python312Packages.google-cloud-logging: 3.11.2 -> 3.11.3 Changelog: https://github.com/googleapis/python-logging/blob/v3.11.3/CHANGELOG.md --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index cd8eab718411..3a2bdd3b850e 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.11.2"; + version = "3.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_logging"; inherit version; - hash = "sha256-SJdEHCt09u2pGBwjqIFyI7YUWUMxSoIdZLcp0wdmyys="; + hash = "sha256-CnPNlBGIdTh9RTU3HZ6UJoYe3vjkT7oSYehngtW41U8="; }; build-system = [ setuptools ]; From 30a49502c7a6c8670e84ecbbd4fdb23cde099e1d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 09:29:17 -0500 Subject: [PATCH 057/215] yabai: 7.1.3 -> 7.1.4 --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 22f21c191000..53834f3cd739 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -27,7 +27,7 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.3"; + version = "7.1.4"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -96,13 +96,13 @@ stdenv'.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-wp5B24DYX1RYHS/3+4WRRCzVE6FyCzatJDpzJWrEIpQ="; + hash = "sha256-DAHZwEhPIBIfR2V+jTKje1msB8OMKzwGYgYnDql8zb0="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-hCwI6ziUR4yuJOv4MQXh3ufbausaDrG8XfjR+jIOeC4="; + hash = "sha256-i/UqmBNTLBYY4ORI1Y7FWr+LZK0f/qMdWLPPuTb9+2w="; }; }; From ae56f103daa8abd66cd4dab2d977eab229227dee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 22:42:40 +0000 Subject: [PATCH 058/215] python312Packages.folium: 0.17.0 -> 0.18.0 --- pkgs/development/python-modules/folium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8be25eafc613..d8e2e317dbba 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-uKT6WqT3pI3rqfV/3CA+mXBk3F7h4RWW1h2FPIy0JH4="; + hash = "sha256-TNj3javEETjWpI3xs1y/AuKHqFwnTBmWORZK2fafKqI="; }; nativeBuildInputs = [ From 77ff1fded3d4e4f29f4f2a1922ef2b3cddf07a66 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Oct 2024 06:17:01 +0300 Subject: [PATCH 059/215] pkgs/top-level/all-packages.nix webcord-vencord: switch to electron_31 Unfortunately Electron 32 is not supported - this is annoying, but we have always remained behind the regular Webcord package due to Electron issues, so nothing new. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5830b3edb7f..8b9d298a187b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33371,7 +33371,7 @@ with pkgs; webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_32; }; - webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_30; }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_31; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; From f5b67283e7844eaf78c1c570ef6f5fdc44fca05b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 19:26:57 +0300 Subject: [PATCH 060/215] python312Packages.orderly-set: init at 5.2.2 --- .../python-modules/orderly-set/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/orderly-set/default.nix diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix new file mode 100644 index 000000000000..93f164a5b603 --- /dev/null +++ b/pkgs/development/python-modules/orderly-set/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "orderly-set"; + version = "5.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seperman"; + repo = "orderly-set"; + rev = "refs/tags/${version}"; + hash = "sha256-ZDo5fSHD0lCn9CRQtWK10QeZoOhuXG3LR3KA/to9gpE="; + }; + patches = [ + # https://github.com/seperman/orderly-set/pull/5 + (fetchpatch { + name = "do-not-import-mypy.patch"; + url = "https://github.com/seperman/orderly-set/commit/34362084868a081b8ebaaf1f13c93a7a798ef557.patch"; + hash = "sha256-eKbnA31ykm5fH0om6cfOaMpy+ZNNWRDkHieaUIHF8OM="; + }) + ]; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "orderly_set" + ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTests = [ + # Statically analyzes types, can be disabled so that mypy won't be needed. + "test_typing_mypy" + ]; + + meta = { + description = "Orderly Set previously known as Ordered Set"; + homepage = "https://github.com/seperman/orderly-set"; + changelog = "https://github.com/seperman/orderly-set/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1222a3ddb722..98ef6c8e066a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9510,6 +9510,8 @@ self: super: with self; { ordered-set = callPackage ../development/python-modules/ordered-set { }; + orderly-set = callPackage ../development/python-modules/orderly-set { }; + orderedset = callPackage ../development/python-modules/orderedset { }; orgparse = callPackage ../development/python-modules/orgparse { }; From c5e848affd3a4d235ddc108974b77e8f6beb88ba Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 19:20:58 +0300 Subject: [PATCH 061/215] python312Packages.deepdiff: adopt by doronbehar --- pkgs/development/python-modules/deepdiff/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index ff583a572018..7788fb0ad6aa 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -72,6 +72,9 @@ buildPythonPackage rec { homepage = "https://github.com/seperman/deepdiff"; changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ + mic92 + doronbehar + ]; }; } From 987094ba31b14d3320cc1b195bb07081b70802be Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 19:20:42 +0300 Subject: [PATCH 062/215] python312Packages.deepdiff: modernize --- .../python-modules/deepdiff/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 7788fb0ad6aa..1b806285a32f 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -2,10 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, + + # dependencies click, ordered-set, orjson, + + # optional-dependencies clevercsv, + + # tests jsonpickle, numpy, pytestCheckHook, @@ -13,13 +23,12 @@ pyyaml, toml, tomli-w, - pythonOlder, }: buildPythonPackage rec { pname = "deepdiff"; version = "7.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +44,11 @@ buildPythonPackage rec { --replace '/tmp/' "$TMPDIR/" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ click ordered-set orjson @@ -66,13 +79,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "deepdiff" ]; - meta = with lib; { + meta = { description = "Deep Difference and Search of any Python object/data"; mainProgram = "deep"; homepage = "https://github.com/seperman/deepdiff"; changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 doronbehar ]; From 6b732100029877351c9fd6f2a4664de3483f02ea Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 19:16:48 +0300 Subject: [PATCH 063/215] python312Packages.deepdiff: 7.0.1 -> 8.0.0 Diff: https://github.com/seperman/deepdiff/compare/refs/tags/7.0.1...8.0.0 Changelog: https://github.com/seperman/deepdiff/releases/tag/8.0.0 --- .../python-modules/deepdiff/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 1b806285a32f..ac3ec5983290 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -9,7 +9,7 @@ # dependencies click, - ordered-set, + orderly-set, orjson, # optional-dependencies @@ -23,11 +23,13 @@ pyyaml, toml, tomli-w, + polars, + pandas, }: buildPythonPackage rec { pname = "deepdiff"; - version = "7.0.1"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -36,23 +38,24 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-HqmAE5sLwyjyUahIUeRIJW0c5eliq/qEzE2FydHwc70="; + hash = "sha256-SnVsYQHTgy0sDKabImSXbSeKES2bBxjE6ZtVzrenm+A="; }; - postPatch = '' - substituteInPlace tests/test_command.py \ - --replace '/tmp/' "$TMPDIR/" - ''; - build-system = [ setuptools ]; dependencies = [ click - ordered-set + orderly-set orjson ]; + pythonRelaxDeps = [ + # Upstream develops this package as well, and from some reason pins this + # dependency to a patch version below this one. No significant changes + # happend in that relase, so we shouldn't worry, especially if tests pass. + "orderly-set" + ]; optional-dependencies = { cli = [ @@ -69,12 +72,17 @@ buildPythonPackage rec { pytestCheckHook python-dateutil tomli-w + polars + pandas ] ++ optional-dependencies.cli; disabledTests = [ # not compatible with pydantic 2.x "test_pydantic1" "test_pydantic2" + # Require pytest-benchmark + "test_cache_deeply_nested_a1" + "test_lfu" ]; pythonImportsCheck = [ "deepdiff" ]; From ce9f200c9614da6d8565cc2b1439235886ad808c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= Date: Wed, 23 Oct 2024 10:17:44 +0200 Subject: [PATCH 064/215] ytt: refactor - Add version test, since it was not correct. - Use the new correct URL to `carvel-dev` github repo. --- pkgs/development/tools/ytt/default.nix | 38 ++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 4a3e61fb9059..a2de21fd7a2b 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,12 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + ytt, +}: buildGoModule rec { pname = "ytt"; version = "0.50.0"; src = fetchFromGitHub { - owner = "vmware-tanzu"; - repo = "carvel-ytt"; + owner = "carvel-dev"; + repo = "ytt"; rev = "v${version}"; sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4="; }; @@ -16,11 +22,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; ldflags = [ - "-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}" + "-s" + "-w" + "-X carvel.dev/ytt/pkg/version.Version=${version}" ]; - subPackages = [ "cmd/ytt" ]; - postInstall = '' installShellCompletion --cmd ytt \ --bash <($out/bin/ytt completion bash) \ @@ -28,11 +34,27 @@ buildGoModule rec { --zsh <($out/bin/ytt completion zsh) ''; + # Once `__structuredArgs` is introduced, integrate checks and + # set some regexes `checkFlags = [ "-skip=TestDataValues.*" ]` + # etc. So far we dont test because passing '*' chars through the Go builder + # is flawed. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = ytt; + command = "ytt --version"; + inherit version; + }; + meta = with lib; { description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values"; mainProgram = "ytt"; homepage = "https://get-ytt.io"; license = licenses.asl20; - maintainers = with maintainers; [ brodes techknowlogick ]; + maintainers = with maintainers; [ + brodes + techknowlogick + gabyx + ]; }; } From 776970bb7d71c1567ff90b8de81b8c3d271a10bf Mon Sep 17 00:00:00 2001 From: Francesco Carmelo Capria Date: Wed, 23 Oct 2024 15:23:37 +0200 Subject: [PATCH 065/215] wired: init at 0.10.6 --- pkgs/by-name/wi/wired/package.nix | 53 +++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/wi/wired/package.nix diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix new file mode 100644 index 000000000000..c18c4462b16a --- /dev/null +++ b/pkgs/by-name/wi/wired/package.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + dbus, + pango, + cairo, + xorg, +}: + +rustPlatform.buildRustPackage rec { + pname = "wired"; + version = "0.10.6"; + + src = fetchFromGitHub { + owner = "Toqozz"; + repo = "wired-notify"; + rev = "refs/tags/${version}"; + hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc="; + }; + + cargoHash = "sha256-gIDMD1jT6Wj5FCgbPURF0aayFBOq2mrZE1GZWQ3iYAA="; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + dbus + pango + cairo + xorg.libXScrnSaver + xorg.libXcursor + xorg.libXrandr + xorg.libX11 + xorg.libXi + ]; + + postInstall = '' + mkdir -p $out/usr/lib/systemd/system + substitute ./wired.service $out/usr/lib/systemd/system/wired.service --replace /usr/bin/wired $out/bin/wired + install -Dm444 -t $out/etc/wired wired.ron wired_multilayout.ron + ''; + + meta = { + description = "Lightweight notification daemon written in Rust"; + homepage = "https://github.com/Toqozz/wired-notify"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fccapria ]; + badPlatforms = lib.platforms.darwin; + mainProgram = "wired"; + }; +} From acae4128d4fcc1f2d81e2acf3af50d24a6592758 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:31:28 +0200 Subject: [PATCH 066/215] powershell: 7.4.5 -> 7.4.6 --- pkgs/shells/powershell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a29bb9c99010..d9b74cf564dc 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.4.5"; + version = "7.4.6"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -84,19 +84,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-pN0wv/jV1luaLO1NF4QRwXI8FzcBev8VCkiMcSs3r1I="; + hash = "sha256-pILWaHh++Yw38KWnaWEH3/2z3DQMW+PRwVPsnSOQcqg="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-8JaGSezUfVUAzLdmxP9No04NeCVMzpCYx/QtDlSEtRM="; + hash = "sha256-wBWbA+hfRK4edpeBigEVWNpsgT0KroSL9awTv0NdhiQ="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-1DE6D4AZBwKz9UIPpLy3a9hlgsF4QoGf2+eYO5SANYA="; + hash = "sha256-ehja7RBbfPyAv4zAB2L+eZAQXdI/lRzDLOt0RlFlDj0="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-wjUJzE0Ixiuf9uom9XnuTFD5eKo0JpM0qF7aL+w29Fs="; + hash = "sha256-b2AVIDxHgGxcxETBnY7QGWleYQ+9lIFUJkv5yo4VdWE="; }; }; tests.version = testers.testVersion { From 5b0e7f9eff9a931a13c8fee51baa6fa94e46c30d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 24 Oct 2024 06:39:57 +0100 Subject: [PATCH 067/215] zenity: 4.0.2 -> 4.0.3 Changes: https://github.com/GNOME/zenity/blob/4.0.3/NEWS --- pkgs/by-name/ze/zenity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index aa23342eebc2..2e907a48eb1f 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-wW3K5G4p4iwvoLlegOBslrKuyThAFhNpyVyF7Z8JMVM="; + hash = "sha256-tCnZe4e9nOf7cqwLeN9TRyXYrTmBfdympMou5TgbCN4="; }; nativeBuildInputs = [ From d49793df1c9d3c5fa068f315bdbaa883bc657166 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 24 Oct 2024 21:04:43 +0800 Subject: [PATCH 068/215] simdutf: 5.5.0 -> 5.6.0 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 8e841ac44636..4aba0ae8d75b 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-LEXx/b0DJZ9xxQX9+4YHjQCLFp2aXCE78Z6iPlXJjAw="; + hash = "sha256-DJCr+QoCmN0wJiXH+mv4g/zJYFfgJDGw0l6pzPriBVs="; }; # Fix build on darwin From 0cd2be5eaa0146e7894166f8bf8a0a03c0d32820 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 24 Oct 2024 09:04:48 -0500 Subject: [PATCH 069/215] perlPackages.NetSNMP: fix tests --- pkgs/top-level/perl-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1d40ccc835b..0dd2524cb614 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19213,7 +19213,18 @@ with self; { url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz"; hash = "sha256-FMN7wcuz883H1sE+DyeoWfFM3P1epUoEZ6iLwlmwt0E="; }; - doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799 + preCheck = + (lib.optionalString stdenv.hostPlatform.isLinux '' + export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols + export LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''); + propagatedBuildInputs = [ + CryptDES + CryptRijndael + DigestHMAC + DigestSHA1 + Socket6 + ]; meta = { description = "Object oriented interface to SNMP"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 3112c84d815b91ff3d2732434b81479c4f7ee235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Oct 2024 18:22:18 +0200 Subject: [PATCH 070/215] python312Packages.pysc2: remove enum34 enum34 is removed by patch --- pkgs/development/python-modules/pysc2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 667ba0390323..54a79bff3909 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, absl-py, - enum34, future, mock, mpyq, @@ -40,7 +39,6 @@ buildPythonPackage { propagatedBuildInputs = [ absl-py - enum34 future mock mpyq From c8fe051f66104e458ec779b9e457dc8a267623cb Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:20:20 +0000 Subject: [PATCH 071/215] warp-terminal: 0.2024.10.15.08.02.stable_03 -> 0.2024.10.23.14.49.stable_00 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index bc420f89b33c..365b4a17878a 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-6cPn6ukGPpEdzCcENGUT5h+UPSo8rrEZEjeLEHJTG/4=", - "version": "0.2024.10.15.08.02.stable_03" + "hash": "sha256-KaHjVEdmzOw3BnFd77vTb+067IEOPIWiJmVOHQcjN6E=", + "version": "0.2024.10.23.14.49.stable_00" }, "linux_x86_64": { - "hash": "sha256-ftTBelAaGWxrOlpDGtEeNT9GjtS4XZdvzUsWxEnrGzs=", - "version": "0.2024.10.15.08.02.stable_03" + "hash": "sha256-gRuA+drCQdOPJrSKky2WKxon84dxVVcfK+0GipzMBZU=", + "version": "0.2024.10.23.14.49.stable_00" }, "linux_aarch64": { - "hash": "sha256-y7oSCc+bsRj7BSF8MiYpNJ73M5xBBTIRhotHdRPsfqk=", - "version": "0.2024.10.15.08.02.stable_03" + "hash": "sha256-LTpcGsQscEbxAosW68yfSb9lDyecDLdci3JzPimTYrQ=", + "version": "0.2024.10.23.14.49.stable_00" } } From 6954bb67983129297e3d11abca734c9b4c9205cc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 23 Oct 2024 08:57:47 +0300 Subject: [PATCH 072/215] python312Packages.deepdiff: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index ac3ec5983290..3b46cf4aac9c 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "8.0.0"; + version = "8.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-SnVsYQHTgy0sDKabImSXbSeKES2bBxjE6ZtVzrenm+A="; + hash = "sha256-e6eTPSGoJ8r/4vGi/iGVFW/BruBADtVMtnO001Qs0IQ="; }; build-system = [ From a28273e38666e62523316f22f0b8a46cb685dbae Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 13:53:24 +0300 Subject: [PATCH 073/215] python311Packages.ttp: disable more failing tests --- pkgs/development/python-modules/ttp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 700f97a68b5f..653ba4ad7171 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -64,6 +64,9 @@ buildPythonPackage rec { disabledTests = [ # data structure mismatches + "test_global_output_deepdiff_with_var_before" + "test_group_specific_output_deepdiff_with_var_before" + "test_group_specific_output_deepdiff_with_var_before_with_add_field" "test_yangson_validate" "test_yangson_validate_yang_lib_in_output_tag_data" "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file" From 411dd1710d43283e0d2ed3b9aecc600b87197b63 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 13:36:11 +0300 Subject: [PATCH 074/215] python312Packages.dbt-common: reorder function inputs --- .../python-modules/dbt-common/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index b97f071343e3..f3bb688e2189 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,24 +1,30 @@ { lib, - agate, + fetchPypi, buildPythonPackage, + pythonOlder, + + # build-system + hatchling, + + # dependencies + agate, colorama, deepdiff, - fetchPypi, - hatchling, isodate, jinja2, jsonschema, mashumaro, pathspec, protobuf, - pytest-mock, - pytest-xdist, - pytestCheckHook, python-dateutil, - pythonOlder, requests, typing-extensions, + + # tests + pytestCheckHook, + pytest-mock, + pytest-xdist, }: buildPythonPackage rec { @@ -34,7 +40,9 @@ buildPythonPackage rec { hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; }; - build-system = [ hatchling ]; + build-system = [ + hatchling + ]; pythonRelaxDeps = [ "protobuf" @@ -60,9 +68,9 @@ buildPythonPackage rec { doCheck = false; nativeCheckInputs = [ - pytest-mock - pytest-xdist pytestCheckHook + pytest-xdist + pytest-mock ]; pythonImportsCheck = [ "dbt_common" ]; From e5a2d548ffbbfce56effdfd3a042e04bec177c11 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 20 Oct 2024 13:39:00 +0300 Subject: [PATCH 075/215] python312Packages.dbt-common: 1.8.0 -> 1.11.0 Not yet fully building, but with a Python package set that uses protobuf4 instead of protobuf5, it is working. --- .../python-modules/dbt-common/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index f3bb688e2189..9b037341b490 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -25,19 +25,24 @@ pytestCheckHook, pytest-mock, pytest-xdist, + numpy, }: buildPythonPackage rec { pname = "dbt-common"; - version = "1.8.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "dbt_common"; - inherit version; - hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-common"; + # Unfortunatly, upstream doesn't tag commits on GitHub, and the pypi source + # doesn't include tests. TODO: Write an update script that will detect the + # version from `dbt_common/__about__.py`. + rev = "ed11c6ceb4f29d4a79489469309d9ce9dd1757e6"; + hash = "sha256-JA6hFQwF7h1tXyCxBVKGgyevdTxyYeN3I/Bwy9uoC0Y="; }; build-system = [ @@ -47,6 +52,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "protobuf" "agate" + "deepdiff" ]; dependencies = [ @@ -64,15 +70,17 @@ buildPythonPackage rec { typing-extensions ] ++ mashumaro.optional-dependencies.msgpack; - # Upstream stopped to tag the source fo rnow - doCheck = false; - nativeCheckInputs = [ pytestCheckHook pytest-xdist pytest-mock ]; - + disabledTests = [ + # Assertion errors (TODO: Notify upstream) + "test_create_print_json" + "test_events" + "test_extra_dict_on_event" + ]; pythonImportsCheck = [ "dbt_common" ]; meta = { From a732568a20879967b743984956275cb99f7ae36a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Oct 2024 22:04:18 +0200 Subject: [PATCH 076/215] metasploit: 6.4.32 -> 6.4.33 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 13 ++++++++----- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 20 +++++++++++++++----- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index b4c9001f3d11..f14aae04e7e8 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.32" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.33" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 2d705c9f8634..0cab46fc0f1b 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: a13f85c09fbf85c2f5f713b5b9a32b6200cc910d - ref: refs/tags/6.4.32 + revision: 1939065b94ee3c2033e720b753c5a6bd70e09c07 + ref: refs/tags/6.4.33 specs: - metasploit-framework (6.4.32) + metasploit-framework (6.4.33) aarch64 abbrev actionpack (~> 7.0.0) @@ -25,6 +25,7 @@ GIT dnsruby drb ed25519 + elftools em-http-request eventmachine faker @@ -45,7 +46,7 @@ GIT metasploit-model metasploit-payloads (= 2.0.183) metasploit_data_models - metasploit_payloads-mettle (= 1.0.32) + metasploit_payloads-mettle (= 1.0.35) mqtt msgpack (~> 1.6.0) mutex_m @@ -196,6 +197,8 @@ GEM domain_name (0.6.20240107) drb (2.2.1) ed25519 (1.3.0) + elftools (1.3.1) + bindata (~> 2) em-http-request (1.1.7) addressable (>= 2.3.4) cookiejar (!= 0.3.1) @@ -282,7 +285,7 @@ GEM railties (~> 7.0) recog webrick - metasploit_payloads-mettle (1.0.32) + metasploit_payloads-mettle (1.0.35) method_source (1.1.0) mini_portile2 (2.8.6) minitest (5.23.1) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 71b6556b100c..074b6b8ceffe 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.32"; + version = "6.4.33"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-vNJxWj7B7LOWw1hE3bK6dX5kumfspWIaheGHpDit4kM="; + hash = "sha256-RMQEFRIArj2RuYk6GFDsGXpWRPANxD8OUJUQMtQUBW4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index a2367cc4b787..7f748cbe4769 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -399,6 +399,16 @@ }; version = "1.3.0"; }; + elftools = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y5ahqk24ngjiyfbj5xapxwfb34yslcpn4l0khdq4pkxkajgqilx"; + type = "gem"; + }; + version = "1.3.1"; + }; em-http-request = { groups = ["default"]; platforms = []; @@ -724,12 +734,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "a13f85c09fbf85c2f5f713b5b9a32b6200cc910d"; - sha256 = "0hz2mlwa91z1hld659gccyx68zkmpardsi2qqfbb7v617rd73lmw"; + rev = "1939065b94ee3c2033e720b753c5a6bd70e09c07"; + sha256 = "0vh52ka3444ma073zi0dy125cyhrxi81hfl9p68kvbh028ah9i24"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.32"; + version = "6.4.33"; }; metasploit-model = { groups = ["default"]; @@ -766,10 +776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dbdcbqmi7l1y3nw6nv1sabjwy5qpkzl7pg8wqhq33mgnswi4afp"; + sha256 = "0fsnr4i0660nhlkq9iyy5x214l2ds3akf6jnngf2hlp8j01w1x4w"; type = "gem"; }; - version = "1.0.32"; + version = "1.0.35"; }; method_source = { groups = ["default"]; From fbfe28975e9547ed9940b12b3c68d5bcfbfc0b11 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 24 Oct 2024 17:27:17 -0400 Subject: [PATCH 077/215] openpgp-card-tools: 0.11.6 -> 0.11.7 Diff: https://codeberg.org/openpgp-card/openpgp-card-tools/compare/v0.11.6...v0.11.7 --- pkgs/by-name/op/openpgp-card-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 5ed445a55eef..8bd0e1fb5cb9 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-ZnIJLNg9soRzGEjoRNbUzDUtj71y54t+qTC4QDjiCmM="; + hash = "sha256-sR+jBCSuDH4YdJz3YuvA4EE36RHV3m/xU8hIEXXsqKo="; }; - cargoHash = "sha256-t+fKCviu9UOz2GHkIBqtSp0vyqXPAR1TuWi4yOYR0Bc="; + cargoHash = "sha256-G5+lVK41hbzy/Ltc0EKoUfqF0M1OYu679jyVjYKJmn0="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; From 228b0356b833fe9cfacb6f3bf8baf5e380d838c9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 24 Oct 2024 17:28:30 -0400 Subject: [PATCH 078/215] python312Packages.cryptg: 0.5 -> 0.5.post0 Diff: https://github.com/cher-nov/cryptg/compare/v0.5...v0.5.post0 --- pkgs/development/python-modules/cryptg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 11492f912a75..73d5258efbe3 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cryptg"; - version = "0.5"; + version = "0.5.post0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,12 +23,12 @@ buildPythonPackage rec { owner = "cher-nov"; repo = pname; rev = "v${version}"; - hash = "sha256-uJfMetplTyRT95P/8ljz4H4ASYMXEM7jROWSpjftKjU="; + hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-HDMztt7/ZpPlpy0IMGuWGGo4vwKhraFTmTTPr9tC+Ok="; + hash = "sha256-BqtswBTurZoKw7DR3S7woDKLqAqIjKdSS5TBwCI+Bps="; }; build-system = [ From 710da54cbfdef7a8bb6783f3f72d37573c9c1f56 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 24 Oct 2024 17:32:03 -0400 Subject: [PATCH 079/215] eigenmath: 3.27-unstable-2024-10-02 -> 3.27-unstable-2024-10-18 Diff: https://github.com/georgeweigt/eigenmath/compare/57a7c74623cdb6ee7f3b67873f6e9af976234e9d...a9d3be2c64a35e06691ba61fd1bf0d9b9cd5822d --- pkgs/applications/science/math/eigenmath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index e1834548525b..6e716fa77a7e 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-10-02"; + version = "3.27-unstable-2024-10-18"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "57a7c74623cdb6ee7f3b67873f6e9af976234e9d"; - hash = "sha256-7xoSFLE4yPuWzoIS65UficBa086o1Yil0Z2ks8EARy0="; + rev = "a9d3be2c64a35e06691ba61fd1bf0d9b9cd5822d"; + hash = "sha256-3t5AsUTNXnkXUfrGeGWcMwwC8kBhpSVx1ioVfKXloZA="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' From 56c91c4828c28bbe9eebbfcb8a767fcc25a0d18c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 07:39:09 +0000 Subject: [PATCH 080/215] ugrep: 6.5.0 -> 7.0.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 1384d0219466..1f78e322d95a 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "6.5.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-IG1HH/mducD6VyQHAvO2xHT+rMFAT1cqAO06TGeIFik="; + hash = "sha256-bq/j+9FVKs8c7YHo1wHiQ3eFgD1dpe1buwfgrH2SZKI="; }; buildInputs = [ From 1ee6b4cab7495d3c80b63a6e3d9c392a807987ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 10:12:58 +0000 Subject: [PATCH 081/215] emacsPackages.el-easydraw: 1.2.0-unstable-2024-07-24 -> 1.2.0-unstable-2024-10-04 --- .../elisp-packages/manual-packages/el-easydraw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index b69423e58331..7cb806b2833d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "edraw"; - version = "1.2.0-unstable-2024-07-24"; + version = "1.2.0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; - rev = "6f93e744d5f62de2176d3d0f0aa1f9e8d84ccefd"; - hash = "sha256-dXu4hDC4qE7W+KkWb9HIqYwesOKisMiZSTAulDpjyfA="; + rev = "ad740d87e768052b0ef5b5e7f0822c7ac1b238fb"; + hash = "sha256-xdyDikE8fUQ12Ra5j5lQUHVLKpTYtvfn1DosusQt61Q="; }; propagatedUserEnvPkgs = [ gzip ]; From 3d27fad72026139c6d5a6d06faffd2d4663781d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Oct 2024 14:28:23 +0300 Subject: [PATCH 082/215] python312Packages.pint: 0.24.1 -> 0.24.3 Diff: https://github.com/hgrecco/pint/compare/refs/tags/0.24.1...0.24.3 Changelog: https://github.com/hgrecco/pint/blob/0.24.3/CHANGES --- pkgs/development/python-modules/pint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 51ef03ffc7dd..1339b39505a9 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pint"; - version = "0.24.1"; + version = "0.24.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "hgrecco"; repo = "pint"; rev = "refs/tags/${version}"; - hash = "sha256-PQAQvjMi7pFgNhUbw20vc306aTyEbCQNHGef/pxxpXo="; + hash = "sha256-PJEgwshTBIqmKMEro+IT+7v4dab3qD7I45OuTOJloR0="; }; build-system = [ From b46365ee776740bd624cdde9830ee0fbc67ec78a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 11:41:17 +0000 Subject: [PATCH 083/215] git-town: 16.3.0 -> 16.4.1 --- pkgs/applications/version-management/git-town/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 00d2722bcdbe..226afe310323 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "16.3.0"; + version = "16.4.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-q4bRUz6ZI6y0AYEDMUBMN1YJxmHkIDDkUiMd4rQbDHk="; + hash = "sha256-8Xr1R6txsJBGzBtvvKOCg2lcAHksl4hNPc9zySkTfdg="; }; vendorHash = null; From 9bf3f227d033b004b6c08b047527cddd7164bc69 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Fri, 25 Oct 2024 08:27:04 -0500 Subject: [PATCH 084/215] perlPackages.NetSNMP: apply Fedora patches --- pkgs/top-level/perl-packages.nix | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0dd2524cb614..bebf906a10f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,7 +7,7 @@ { config , stdenv, lib, buildPackages, pkgs, darwin -, fetchurl, fetchpatch, fetchFromGitHub, fetchFromGitLab +, fetchurl, fetchpatch, fetchpatch2, fetchFromGitHub, fetchFromGitLab , perl, shortenPerlShebang , nixosTests }: @@ -19213,6 +19213,28 @@ with self; { url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz"; hash = "sha256-FMN7wcuz883H1sE+DyeoWfFM3P1epUoEZ6iLwlmwt0E="; }; + patches = [ + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Switch_from_Socket6_to_Socket.patch"; + hash = "sha256-IpVhqI+dXqzauTkLF0Doulg5U33FxHUhqFTp0jeMtMY="; + }) + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Simple_rewrite_to_Digest-HMAC-helpers.patch"; + hash = "sha256-ZXo9w2YLtPmM1SJLvIiLWefw7SwrTFyTo4eX6DG1yfA="; + }) + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Split_usm.t_to_two_parts.patch"; + hash = "sha256-A2gsD6DIX1aFSVLbSL/1zKSM1xiM6hWBadJJH7f5E8o="; + }) + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Add_tests_for_another_usm_scenarios.patch"; + hash = "sha256-U7nNuL35l/zdSzx1jgjp1PmLQn3xzzDw9DGnyeydi2E="; + }) + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Rewrite_from_Digest-SHA1-to-Digest-SHA.patch"; + hash = "sha256-dznhj1Fcy0iBBl92p825InjkNZixR2MURVQ/b9bVjtc="; + }) + ]; preCheck = (lib.optionalString stdenv.hostPlatform.isLinux '' export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols @@ -19222,8 +19244,6 @@ with self; { CryptDES CryptRijndael DigestHMAC - DigestSHA1 - Socket6 ]; meta = { description = "Object oriented interface to SNMP"; From b44ec15ebc3d1947c700a026a90d0ea8c5964e43 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 24 Oct 2024 10:17:28 -0500 Subject: [PATCH 085/215] perlPackages.NetSNMP: add patch to support newer SHA algorithms The aged perlPackages.NetSNMP library does not support modern SHA algorithms for authentication. It's possible to enable support for these newer protocols with a patch. The patch is taken from the OpenBSD ports tree: https://github.com/openbsd/ports/blob/master/net/p5-Net-SNMP/patches/patch-lib_Net_SNMP_Security_USM_pm It enables support for SHA 224, 256, 384, and 512. Tests are also include in the patch for these additional algorithms. --- .../net-snmp-add-sha-algorithms.patch | 913 ++++++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 914 insertions(+) create mode 100644 pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch diff --git a/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch b/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch new file mode 100644 index 000000000000..be732a1b80de --- /dev/null +++ b/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch @@ -0,0 +1,913 @@ +From https://github.com/openbsd/ports/blob/master/net/p5-Net-SNMP/patches/patch-lib_Net_SNMP_Security_USM_pm +Tests for the additional algorithms have also been added. + +diff --git a/MANIFEST b/MANIFEST +index 3430564..d3dd7f0 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -40,3 +40,7 @@ t/usm-sha1-3des.t + t/usm-sha1-aes.t + t/usm-sha1-cfb192aes.t + t/usm-sha1-des.t ++t/usm-sha224-aes.t ++t/usm-sha256-aes.t ++t/usm-sha384-aes.t ++t/usm-sha512-aes.t +diff --git a/lib/Net/SNMP/Security/USM.pm b/lib/Net/SNMP/Security/USM.pm +index a76ef56..0bcd52c 100644 +--- a/lib/Net/SNMP/Security/USM.pm ++++ b/lib/Net/SNMP/Security/USM.pm +@@ -26,8 +26,9 @@ use Net::SNMP::Message qw( + use Crypt::DES(); + use Digest::MD5(); + use Digest::SHA(); +-use Digest::HMAC_MD5(); +-use Digest::HMAC_SHA1(); ++ ++use Digest::SHA qw( hmac_sha1 hmac_sha224 hmac_sha256 hmac_sha384 hmac_sha512 ); ++use Digest::HMAC_MD5 qw ( hmac_md5 ); + + ## Version of the Net::SNMP::Security::USM module + +@@ -41,7 +42,9 @@ our @EXPORT_OK; + + our %EXPORT_TAGS = ( + authprotos => [ +- qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA ) ++ qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA ++ AUTH_PROTOCOL_HMACSHA224 AUTH_PROTOCOL_HMACSHA256 ++ AUTH_PROTOCOL_HMACSHA384 AUTH_PROTOCOL_HMACSHA512 ) + ], + levels => [ + qw( SECURITY_LEVEL_NOAUTHNOPRIV SECURITY_LEVEL_AUTHNOPRIV +@@ -64,9 +67,13 @@ $EXPORT_TAGS{ALL} = [ @EXPORT_OK ]; + + ## RCC 3414 - Authentication protocols + +-sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol +-sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol +-sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol ++sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol ++sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol ++sub AUTH_PROTOCOL_HMACSHA224 { '1.3.6.1.6.3.10.1.1.4' } # usmHMAC128SHA224AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA256 { '1.3.6.1.6.3.10.1.1.5' } # usmHMAC192SHA256AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA384 { '1.3.6.1.6.3.10.1.1.6' } # usmHMAC256SHA384AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA512 { '1.3.6.1.6.3.10.1.1.7' } # usmHMAC384SHA512AuthProtocol + + ## RFC 3414 - Privacy protocols + +@@ -125,6 +132,7 @@ sub new + '_time_epoc' => time(), # snmpEngineBoots epoc + '_user_name' => q{}, # securityName + '_auth_data' => undef, # Authentication data ++ '_auth_maclen' => undef, # MAC length + '_auth_key' => undef, # authKey + '_auth_password' => undef, # Authentication password + '_auth_protocol' => AUTH_PROTOCOL_HMACMD5, # authProtocol +@@ -281,10 +289,10 @@ sub generate_request_msg + if ($pdu->security_level() > SECURITY_LEVEL_NOAUTHNOPRIV) { + + # Save the location to fill in msgAuthenticationParameters later +- $auth_location = $msg->length() + 12 + length $pdu_buffer; ++ $auth_location = $msg->length() + $this->{_auth_maclen} + length $pdu_buffer; + + # Set the msgAuthenticationParameters to all zeros +- $auth_params = pack 'x12'; ++ $auth_params = pack "x$this->{_auth_maclen}"; + } + + if (!defined $msg->prepare(OCTET_STRING, $auth_params)) { +@@ -419,12 +427,12 @@ sub process_incoming_msg + # to compute the HMAC properly. + + if (my $len = length $auth_params) { +- if ($len != 12) { ++ if ($len != $this->{_auth_maclen}) { + return $this->_error( + 'The msgAuthenticationParameters length of %d is invalid', $len + ); + } +- substr ${$msg->reference}, ($msg->index() - 12), 12, pack 'x12'; ++ substr ${$msg->reference}, ($msg->index() - $this->{_auth_maclen}), $this->{_auth_maclen}, pack "x$this->{_auth_maclen}"; + } + + # msgPrivacyParameters::=OCTET STRING +@@ -748,6 +756,18 @@ sub _auth_password + quotemeta AUTH_PROTOCOL_HMACMD5, AUTH_PROTOCOL_HMACMD5, + '(?:hmac-)?sha(?:-?1|-96)?', AUTH_PROTOCOL_HMACSHA, + quotemeta AUTH_PROTOCOL_HMACSHA, AUTH_PROTOCOL_HMACSHA, ++ '(?:hmac-)?sha(?:-?224)', AUTH_PROTOCOL_HMACSHA224, ++ 'usmHMAC128SHA224AuthProtocol', AUTH_PROTOCOL_HMACSHA224, ++ quotemeta AUTH_PROTOCOL_HMACSHA224,AUTH_PROTOCOL_HMACSHA224, ++ '(?:hmac-)?sha(?:-?256)', AUTH_PROTOCOL_HMACSHA256, ++ 'usmHMAC192SHA256AuthProtocol', AUTH_PROTOCOL_HMACSHA256, ++ quotemeta AUTH_PROTOCOL_HMACSHA256,AUTH_PROTOCOL_HMACSHA256, ++ '(?:hmac-)?sha(?:-?384)', AUTH_PROTOCOL_HMACSHA384, ++ 'usmHMAC256SHA384AuthProtocol', AUTH_PROTOCOL_HMACSHA384, ++ quotemeta AUTH_PROTOCOL_HMACSHA384,AUTH_PROTOCOL_HMACSHA384, ++ '(?:hmac-)?sha(?:-?512)', AUTH_PROTOCOL_HMACSHA512, ++ 'usmHMAC384SHA512AuthProtocol', AUTH_PROTOCOL_HMACSHA512, ++ quotemeta AUTH_PROTOCOL_HMACSHA512,AUTH_PROTOCOL_HMACSHA512, + }; + + sub _auth_protocol +@@ -1100,7 +1120,7 @@ sub _authenticate_outgoing_msg + } + + # Set the msgAuthenticationParameters +- substr ${$msg->reference}, -$auth_location, 12, $this->_auth_hmac($msg); ++ substr ${$msg->reference}, -$auth_location, $this->{_auth_maclen}, $this->_auth_hmac($msg); + + return TRUE; + } +@@ -1126,7 +1146,7 @@ sub _auth_hmac + return q{} if (!defined($this->{_auth_data}) || !defined $msg); + + return substr +- $this->{_auth_data}->reset()->add(${$msg->reference()})->digest(), 0, 12; ++ $this->{_auth_data}(${$msg->reference()}, $this->{_auth_key}), 0, $this->{_auth_maclen}; + } + + sub _auth_data_init +@@ -1141,16 +1161,35 @@ sub _auth_data_init + + if ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACMD5) { + +- $this->{_auth_data} = +- Digest::HMAC_MD5->new($this->{_auth_key}); ++ $this->{_auth_data} = \&hmac_md5; ++ $this->{_auth_maclen} = 12; + + } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) { + +- $this->{_auth_data} = +- Digest::HMAC_SHA1->new($this->{_auth_key}); ++ $this->{_auth_data} = \&hmac_sha1; ++ $this->{_auth_maclen} = 12; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA224) { ++ ++ $this->{_auth_data} = \&hmac_sha224; ++ $this->{_auth_maclen} = 16; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA256) { ++ ++ $this->{_auth_data} = \&hmac_sha256; ++ $this->{_auth_maclen} = 24; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA384) { ++ ++ $this->{_auth_data} = \&hmac_sha384; ++ $this->{_auth_maclen} = 32; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA512) { ++ ++ $this->{_auth_data} = \&hmac_sha512; ++ $this->{_auth_maclen} = 48; + + } else { +- + return $this->_error( + 'The authProtocol "%s" is unknown', $this->{_auth_protocol} + ); +@@ -1628,6 +1667,10 @@ sub _auth_key_validate + { + AUTH_PROTOCOL_HMACMD5, [ 16, 'HMAC-MD5' ], + AUTH_PROTOCOL_HMACSHA, [ 20, 'HMAC-SHA1' ], ++ AUTH_PROTOCOL_HMACSHA224, [ 28, 'HMAC-SHA224' ], ++ AUTH_PROTOCOL_HMACSHA256, [ 32, 'HMAC-SHA256' ], ++ AUTH_PROTOCOL_HMACSHA384, [ 48, 'HMAC-SHA384' ], ++ AUTH_PROTOCOL_HMACSHA512, [ 64, 'HMAC-SHA512' ], + }; + + if (!exists $key_len->{$this->{_auth_protocol}}) { +@@ -1783,8 +1826,12 @@ sub _password_localize + + my $digests = + { +- AUTH_PROTOCOL_HMACMD5, 'Digest::MD5', +- AUTH_PROTOCOL_HMACSHA, 'Digest::SHA', ++ AUTH_PROTOCOL_HMACMD5, ['Digest::MD5', ], ++ AUTH_PROTOCOL_HMACSHA, ['Digest::SHA', 1], ++ AUTH_PROTOCOL_HMACSHA224, ['Digest::SHA', 224], ++ AUTH_PROTOCOL_HMACSHA256, ['Digest::SHA', 256], ++ AUTH_PROTOCOL_HMACSHA384, ['Digest::SHA', 384], ++ AUTH_PROTOCOL_HMACSHA512, ['Digest::SHA', 512], + }; + + if (!exists $digests->{$this->{_auth_protocol}}) { +@@ -1793,7 +1840,12 @@ sub _password_localize + ); + } + +- my $digest = $digests->{$this->{_auth_protocol}}->new; ++ my $digest; ++ if (!defined($digests->{$this->{_auth_protocol}}[1])) { ++ $digest = $digests->{$this->{_auth_protocol}}[0]->new; ++ } else { ++ $digest = $digests->{$this->{_auth_protocol}}[0]->new($digests->{$this->{_auth_protocol}}[1]); ++ } + + # Create the initial digest using the password + +diff --git a/t/usm-sha224-aes.t b/t/usm-sha224-aes.t +new file mode 100644 +index 0000000..e7d118e +--- /dev/null ++++ b/t/usm-sha224-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town . ++# Copyright (c) 2024 Michal Josef Špaček . ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha224', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '0bd8827c6e29f8065e08e09237f177e410f69b90e1782be682075674', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '0bd8827c6e29f8065e08e09237f177e4', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '042228c5467793ab001f4be546de4b990f90998b09d43f2baaffb52a5d36457cef3b5ab7', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha256-aes.t b/t/usm-sha256-aes.t +new file mode 100644 +index 0000000..4521187 +--- /dev/null ++++ b/t/usm-sha256-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town . ++# Copyright (c) 2024 Michal Josef Špaček . ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha256', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '8982e0e549e866db361a6b625d84cccc11162d453ee8ce3a6445c2d6776f0f8b', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '8982e0e549e866db361a6b625d84cccc', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422863d06faf464369a298b66062e54374ba3b4a0f862162d25ba72130038f8befc9e21', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha384-aes.t b/t/usm-sha384-aes.t +new file mode 100644 +index 0000000..e88ca4a +--- /dev/null ++++ b/t/usm-sha384-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town . ++# Copyright (c) 2024 Michal Josef Špaček . ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha384', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '3b298f16164a11184279d5432bf169e2d2a48307de02b3d3f7e2b4f36eb6f0455a53689a3937eea07319a633d2ccba78', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '3b298f16164a11184279d5432bf169e2', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422850967bbff81be49aefadf9b6ee3eedb9093609fcfc813a21bdf09b469965923bfc0', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha512-aes.t b/t/usm-sha512-aes.t +new file mode 100644 +index 0000000..c5eadf3 +--- /dev/null ++++ b/t/usm-sha512-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town . ++# Copyright (c) 2024 Michal Josef Špaček . ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha512', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '22a5a36cedfcc085807a128d7bc6c2382167ad6c0dbc5fdff856740f3d84c099ad1ea87a8db096714d9788bd544047c9021e4229ce27e4c0a69250adfcffbb0b', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '22a5a36cedfcc085807a128d7bc6c238', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422bae4cdb263a0936b189051e9b1759183b16d07c9a7d8bf633d6dd2e817a2ac2fe742', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bebf906a10f6..3b533a10e96b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19234,6 +19234,7 @@ with self; { url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Rewrite_from_Digest-SHA1-to-Digest-SHA.patch"; hash = "sha256-dznhj1Fcy0iBBl92p825InjkNZixR2MURVQ/b9bVjtc="; }) + ../development/perl-modules/net-snmp-add-sha-algorithms.patch ]; preCheck = (lib.optionalString stdenv.hostPlatform.isLinux '' From d528fb1d82063c447da60532faff5dd0da7f713b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 13:29:52 +0000 Subject: [PATCH 086/215] gitlab-ci-ls: 0.21.3 -> 0.22.0 --- pkgs/by-name/gi/gitlab-ci-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index a7a85c977fc2..ed0f4c522756 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-3PqGnknP5ilwPCDsD8GwIEamZC24lEnuQhipTo8RDI0="; + hash = "sha256-RXM581tW78YzH+NQhkpsbHz6m+PAF7NQ5p3TFugPo+M="; }; - cargoHash = "sha256-c31madEElZpHbzyKHqUDyPW/maVrkNKlldX24Y3iFGQ="; + cargoHash = "sha256-PuNpkDjoJr1GttETWHA9X+LYNIJSgBXdZId5q2JSo6g="; nativeBuildInputs = [ pkg-config ]; buildInputs = From 2f3847af4f82d231e1ff6a4ff6a354c1c003db23 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 21:41:21 +0800 Subject: [PATCH 087/215] qq: nixfmt --- pkgs/by-name/qq/qq/package.nix | 75 ++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 6615c4133f8a..0678dd5a7eec 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -1,30 +1,31 @@ -{ alsa-lib -, libuuid -, cups -, dpkg -, fetchurl -, glib -, libssh2 -, gtk3 -, lib -, libayatana-appindicator -, libdrm -, libgcrypt -, libkrb5 -, libnotify -, mesa # for libgbm -, libpulseaudio -, libGL -, nss -, xorg -, systemd -, stdenv -, vips -, at-spi2-core -, autoPatchelfHook -, makeShellWrapper -, wrapGAppsHook3 -, commandLineArgs ? "" +{ + alsa-lib, + libuuid, + cups, + dpkg, + fetchurl, + glib, + libssh2, + gtk3, + lib, + libayatana-appindicator, + libdrm, + libgcrypt, + libkrb5, + libnotify, + mesa, # for libgbm + libpulseaudio, + libGL, + nss, + xorg, + systemd, + stdenv, + vips, + at-spi2-core, + autoPatchelfHook, + makeShellWrapper, + wrapGAppsHook3, + commandLineArgs ? "", }: let @@ -39,7 +40,8 @@ let hash = sources.arm64_hash; }; }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation { pname = "qq"; @@ -87,7 +89,12 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid ]}" \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + libGL + libuuid + ] + }" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" @@ -113,9 +120,15 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://im.qq.com/linuxqq/"; description = "Messaging app"; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ]; + maintainers = with lib.maintainers; [ + fee1-dead + bot-wxt1221 + ]; }; } From 8e1ad7ddb545b9277a8428435ad86ef29acfc4cf Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 25 Oct 2024 21:44:12 +0800 Subject: [PATCH 088/215] qq: 3.2.12-2024.9.27 -> 3.2.13-2024.10.23 --- pkgs/by-name/qq/qq/package.nix | 6 +++--- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 0678dd5a7eec..66321e3b4dc4 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -117,15 +117,15 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://im.qq.com/linuxqq/"; description = "Messaging app"; platforms = [ "x86_64-linux" "aarch64-linux" ]; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index f3783a8ba511..3ff5e1afb0f9 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-09-28 +# Last updated: 2024-10-25 { - version = "3.2.12-2024.9.27"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_arm64_01.deb"; - arm64_hash = "sha256-VfM+p2cTNkDZc7sTftfTuRSMKVWwE6TerW25pA1MIR0="; - amd64_hash = "sha256-xBGSSxXDu+qUwj203i3iAkfI97iLtGOuGMGfEU6kCyQ="; + version = "3.2.13-2024.10.23"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_arm64_01.deb"; + arm64_hash = "sha256-n2ezKgLfmugUZYvGzDvaLKy+Tf8ooUC6Oc6xCDp5rYA="; + amd64_hash = "sha256-H5ACKFVV4AQ3de9UV4i9ejL1WjuuPJhTLTVqK5EcssM="; } From cefa71443efbc8aafe0bee66e92dd1cca39db518 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Oct 2024 18:03:54 +0200 Subject: [PATCH 089/215] python312Packages.twilio: 9.3.4 -> 9.3.6 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.3.4...9.3.6 Changelog: https://github.com/twilio/twilio-python/blob/9.3.6/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 894fb118e01c..7faf26909ea9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.4"; + version = "9.3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-74tJt3BfSKfsl0A1gz7XVzlvumQ8H++Nfp+SEknMYcY="; + hash = "sha256-H/MBRiGU2EnrhspX2ilVvnxdr7A50q+snCM2inobrcs="; }; build-system = [ setuptools ]; From c04efb0ce11a51f847c5d6f3bed461d2797165d2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:33:39 +0200 Subject: [PATCH 090/215] postgresqlPackages.tds_fdw: 2.0.3-unstable-2024-02-10 -> 2.0.4 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/tds-fdw/tds_fdw/releases/tag/v2.0.4 --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 4a192cda9aa3..2dbf344fc624 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -2,16 +2,15 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; - # Move to stable version when it's released. - version = "2.0.3-unstable-2024-02-10"; + version = "2.0.4"; buildInputs = [ postgresql freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "f78bd38955d01d3ca357b90717588ec2f90b4991"; - hash = "sha256-3J8wzk0YIxRPhALd5PgVW000hzQw3r4rTrnqg9uB/Bo="; + rev = "v${version}"; + hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; installPhase = '' @@ -21,13 +20,10 @@ stdenv.mkDerivation rec { install -D tds_fdw.control -t $out/share/postgresql/extension ''; - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - meta = with lib; { description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; + changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${version}"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; From e5ef57b0a167c29c9fb400bec964e46cbe93add6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 02:27:58 +0000 Subject: [PATCH 091/215] nagiosPlugins.check_ssl_cert: 2.84.4 -> 2.84.5 --- .../monitoring/nagios-plugins/check_ssl_cert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix index c31f28dbfdc9..9ad31b8efaa0 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.84.4"; + version = "2.84.5"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-HVif2pjVumrf2YFSHbNiL9pfXy8XNeXHRgaIlx/Tzds="; + hash = "sha256-4/vrJ3G45kEg77IbLlWqQYpYYnqMxW3lr9tPGbv5Qno="; }; nativeBuildInputs = [ makeWrapper ]; From 896102a82f1a6d145b366a78c3e99b3a4e9f847f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 05:36:17 +0000 Subject: [PATCH 092/215] gaugePlugins.dotnet: 0.7.1 -> 0.7.2 --- pkgs/development/tools/gauge/plugins/dotnet/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index 19d228a955cc..3e3aac11ed19 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.7.1", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.1/gauge-dotnet-0.7.1.zip", - "hash": "sha256-0sJctSdQfkm70Z1JDFMc2qwo0PbDWYlHbqfVsnlHyDg=" + "version": "0.7.2", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.2/gauge-dotnet-0.7.2.zip", + "hash": "sha256-ac2pf0st1p/DPAXgQC689nbD+DO7DYkxFqrVItq+UWw=" } From 995db3f29a6e2c2c129a6a581437cf3f17334778 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 24 Oct 2024 20:10:44 +0800 Subject: [PATCH 093/215] send: init at 3.4.23 --- pkgs/by-name/se/send/package.nix | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/se/send/package.nix diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix new file mode 100644 index 000000000000..4c92e5642f62 --- /dev/null +++ b/pkgs/by-name/se/send/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + makeBinaryWrapper, + nodejs, + nixosTests, +}: + +buildNpmPackage rec { + pname = "send"; + version = "3.4.23"; + + src = fetchFromGitHub { + owner = "timvisee"; + repo = "send"; + rev = "refs/tags/v${version}"; + hash = "sha256-bqQEXLwUvTKX+m2yNHRnrl+eeaGmcovXpXugxd+j14A="; + }; + + npmDepsHash = "sha256-r1iaurKuhpP0sevB5pFdtv9j1ikM1fKL7Jgakh4FzTI="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + env = { + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; + }; + + makeCacheWritable = true; + + npmPackFlags = [ "--ignore-scripts" ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + postInstall = '' + cp -r dist $out/lib/node_modules/send/ + ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json + + makeWrapper ${lib.getExe nodejs} $out/bin/send \ + --add-flags $out/lib/node_modules/send/server/bin/prod.js \ + --set "NODE_ENV" "production" + ''; + + passthru.tests = { + inherit (nixosTests) send; + }; + + meta = { + description = "File Sharing Experiment"; + changelog = "https://github.com/timvisee/send/releases/tag/v${version}"; + homepage = "https://github.com/timvisee/send"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "send"; + }; +} From e234f26a1eeba2a70f00815dc3c108483c05f5e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 05:44:09 +0000 Subject: [PATCH 094/215] git-repo: 2.47 -> 2.48 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f9c59ad18ebf..7a95582ee0ed 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.47"; + version = "2.48"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-LFzUvDMNGxp5HzdjlaN0VS7HpIzN8GA5MQL61teKRvo="; + hash = "sha256-BrdB6SqQlLRvXbfIXHqaKD+F/SBzqGru6ISkUrEnUeQ="; }; # Fix 'NameError: name 'ssl' is not defined' From a885d155db8b67c6e00cea7062db47a96056770e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 08:18:04 +0000 Subject: [PATCH 095/215] vtm: 0.9.99.13 -> 0.9.99.35 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index cddabd79db23..33f866dd56d7 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.13"; + version = "0.9.99.35"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-IXxbEwwwqqy5zepdJULlIsrz2csnpGXQhBzbc5AW7II="; + hash = "sha256-XPBInofzFNBMuJ0oP7ZooDuRukuXBWkEzdEq09MHykA="; }; nativeBuildInputs = [ From 66f4cef65e9e8363c1cf26fab4b7e7f343dbd300 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 26 Oct 2024 13:20:36 +0200 Subject: [PATCH 096/215] dependency-track: 4.12.0 -> 4.12.1 --- pkgs/by-name/de/dependency-track/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index ae33be78335c..02d143803b0c 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -11,7 +11,7 @@ nixosTests, }: let - version = "4.12.0"; + version = "4.12.1"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -21,10 +21,10 @@ let owner = "DependencyTrack"; repo = "frontend"; rev = version; - hash = "sha256-7omFxT3WBQp6xftgU6ttGgwIGbLXLetQz2ySvsgsQic="; + hash = "sha256-M7UtyhIuEi6ebkjO8OM0VVi8LQ+VqeVIzBgQwIzSAzg="; }; - npmDepsHash = "sha256-LZg3n1+L6tvfC0gBKf8YZd/UMDz04v1V9qrJZrAr4W4="; + npmDepsHash = "sha256-ZU5D3ZXLaZ1m2YP6uZmpzahP2JQPL9tdOHOyN9fp/XA="; forceGitDeps = true; makeCacheWritable = true; @@ -41,7 +41,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-FJ4VNDpmVBXU1/URb/Rnu0LXAbxKw6Zd7MPbN4bs9eY="; + hash = "sha256-Gx7tGkibSu+v4gGKC61EFwUsdruMh0t2gTnnNazjqco="; }; patches = [ @@ -56,7 +56,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-YrlGVJ0Hp9VHfMD0+hT/9q8tskft6RvszmU4tRAXSAY="; + mvnHash = "sha256-4QtWvsIFiS4d55y45tj3RLE4YYdXLrqpzqS7mOqRWYw="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; From 38ddbee29ce862d7ff15aa4f90607ccbf5374075 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 26 Oct 2024 14:05:36 +0100 Subject: [PATCH 097/215] =?UTF-8?q?prometheus-pushgateway:=201.9.0=20?= =?UTF-8?q?=E2=86=92=201.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/monitoring/prometheus/pushgateway.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index cc8e11ade635..fde0bab36916 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-SpHxBxBl0APP/y7MnR/p/+VjNAvFOZVlgGMlMGTbodI="; + sha256 = "sha256-Avp5hWRdkM/vCz6B/b7uOrnYjFrN5UkE7siK0+ANO1Q="; }; - vendorHash = "sha256-GydAY73Ui6z833x0DoWa6BpK35CYdYfyHw2+RwT3miw="; + vendorHash = "sha256-cyZ/LzKB3UlyqzID9f6I4niwJ/sPIm2htVOn3Ik2HAY="; ldflags = [ "-s" From 28bae7c07d2b867a67c0558ef13b95b2506ce7b0 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 26 Oct 2024 14:08:33 +0100 Subject: [PATCH 098/215] prometheus-pushgateway: Migrated to by-name. --- .../pr/prometheus-pushgateway/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{servers/monitoring/prometheus/pushgateway.nix => by-name/pr/prometheus-pushgateway/package.nix} (100%) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pushgateway.nix rename to pkgs/by-name/pr/prometheus-pushgateway/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc47d2ca4b0f..775e5706a8d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24947,7 +24947,6 @@ with pkgs; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; - prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { }; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; From b6d191bbc2c0522568a2ce7a7865c37106148430 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:34:46 +0200 Subject: [PATCH 099/215] postgresqlPackages.plr: 8.4.6 -> 8.4.7 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/postgres-plr/plr/blob/master/changelog.md#846---2023-08-01 --- pkgs/servers/sql/postgresql/ext/plr.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 05d22c19a8b0..b30b59b86d2a 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plr"; - version = "8.4.6"; + version = "8.4.7"; src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-c+wKWL66pulihVQnhdbzivrZOMD1/FfOpb+vFoHgqVg="; + sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; }; nativeBuildInputs = [ pkg-config ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PL/R - R Procedural Language for PostgreSQL"; homepage = "https://github.com/postgres-plr/plr"; + changelog = "https://github.com/postgres-plr/plr/blob/${src.rev}/changelog.md"; maintainers = with maintainers; [ qoelet ]; platforms = postgresql.meta.platforms; license = licenses.gpl2Only; From d37563232d38851f090a81db0b170f7c4858c4f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:36:35 +0200 Subject: [PATCH 100/215] postgresqlPackages.pgroonga: 3.1.8 -> 3.2.3 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/pgroonga/pgroonga/releases --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 0ba7fa093820..3a7c9e237f98 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.1.8"; + version = "3.2.3"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-Wjh0NJK6IfcI30R7HKCsB87/lxXZYEqiMD9t2nldCW4="; + hash = "sha256-k9+DgiLzU2cA3jvw3pMF7/FmDGxsCYtAOaUtf2LMTnw="; }; nativeBuildInputs = [ pkg-config ]; From 10d228bc7fa94e848c987a68c2bbc36ce633af0b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:39:32 +0200 Subject: [PATCH 101/215] postgresqlPackages.pg_squeeze: 1.6.2 -> 1.7.0 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/cybertec-postgresql/pg_squeeze/releases The changelog is only available for beta 2, but 1.7.0 was released properly after that without changelog. --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index d91b0fb1c1a5..a5bd1ed1c31f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pg_squeeze"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cybertec-postgresql"; repo = "pg_squeeze"; rev = "REL${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-YS13iIpQ4NJe0N6bRVa2RDxEMwEzBc2mjNYM5/Vqjn8="; + hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; buildInputs = [ From 6d1cbda7248beb00cf5a30b46ec375153371d0f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:41:04 +0200 Subject: [PATCH 102/215] postgresqlPackages.pg_similarity: 1.0 -> 1.0-unstable-2021-01-12 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/eulerto/pg_similarity/compare/pg_similarity_1_0...master --- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index a0669331055b..5f05d7925af0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, gcc, postgresql }: +{ stdenv, lib, fetchFromGitHub, gcc, postgresql, unstableGitUpdater }: stdenv.mkDerivation { - pname = "pg_similarity"; - version = "1.0"; + version = "1.0-unstable-2021-01-12"; + src = fetchFromGitHub { owner = "eulerto"; repo = "pg_similarity"; - rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5"; - sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim"; + rev = "b9cb0a2d501b91e33cd1ef550b05483ca3563f71"; + sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; }; buildInputs = [ postgresql gcc ]; @@ -20,6 +20,8 @@ stdenv.mkDerivation { install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension ''; + passthru.updateScript = unstableGitUpdater {}; + meta = { description = "Extension to support similarity queries on PostgreSQL"; longDescription = '' From 31d68c9d30f682211693e96daa4385acae8fb824 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 21:37:24 +0200 Subject: [PATCH 103/215] postgresql16Packages.pg_similarity: fix build on darwin Also fixes the build on linux with clang (JIT). --- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 5f05d7925af0..8bcb8777c57b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gcc, postgresql, unstableGitUpdater }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater }: stdenv.mkDerivation { pname = "pg_similarity"; @@ -11,7 +11,17 @@ stdenv.mkDerivation { sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; }; - buildInputs = [ postgresql gcc ]; + patches = [ + (fetchpatch { + # https://github.com/eulerto/pg_similarity/pull/43 + # Also applied in debian as https://sources.debian.org/data/main/p/pg-similarity/1.0-8/debian/patches/pg16 + name = "pg16.patch"; + url = "https://github.com/eulerto/pg_similarity/commit/f7781ea5ace80f697a8249e03e3ce47d4b0f6b2f.patch"; + hash = "sha256-MPDvWfNzSg28lXL5u5/Un9pOCJjqJ4Fz9b8XCfalgts="; + }) + ]; + + buildInputs = [ postgresql ]; makeFlags = [ "USE_PGXS=1" ]; From f36c4e6bbff8c490bcc9db247e1d1ca4f33df6da Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:41:45 +0200 Subject: [PATCH 104/215] postgresqlPackages.pg_ivm: 1.8 -> 1.9 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/sraoss/pg_ivm/releases/tag/v1.9 --- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 46c01251d503..fcae540d1356 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-HncWX3jx9sEvxGGMMZ9QT4tDQ4JYbkNrFw2aZHgCVE8="; + hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; }; buildInputs = [ postgresql ]; From 9fc6c9536f2eee558acbd6d1055f3e6b2e6b69fe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:42:45 +0200 Subject: [PATCH 105/215] postgresqlPackages.pg_cron: 1.6.2 -> 1.6.4 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/citusdata/pg_cron/releases/tag/v1.6.3 https://github.com/citusdata/pg_cron/releases/tag/v1.6.4 --- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 02c6e6435ae7..3dea36f7e740 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.6.2"; + version = "1.6.4"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - hash = "sha256-/dD1gX0+RRsBFIjSV9TVk+ppPw0Jrzssl+rRZ2qAp4w="; + hash = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40="; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; - changelog = "https://github.com/citusdata/pg_cron/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${version}"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; From 8b831f9b151877908fe15a7281d815bb87e63100 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:43:32 +0200 Subject: [PATCH 106/215] postgresqlPackages.lantern: 0.2.4 -> 0.3.3 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/lanterndata/lantern/releases --- pkgs/servers/sql/postgresql/ext/lantern.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 9a3e01d53537..118c19699292 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -2,19 +2,20 @@ , stdenv , cmake , fetchFromGitHub +, openssl , postgresql , postgresqlTestHook }: stdenv.mkDerivation (finalAttrs: { pname = "postgresql-lantern"; - version = "0.2.4"; + version = "0.3.3"; src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; rev = "v${finalAttrs.version}"; - hash = "sha256-d5CdS11Z0u8+oPvjH6gVx6k8y05SS6wU3PnafcEgQeY="; + hash = "sha256-aw003Y2T9/yNJ5dkCD+qQsUO2V7Q63I/E2IFaZAPd90="; fetchSubmodules = true; }; @@ -23,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + openssl postgresql ]; From 97b965aedbdded70e5e26b6db5b9f0870767d981 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 11:44:09 +0200 Subject: [PATCH 107/215] postgresqlPackages.plv8: 3.2.2 -> 3.2.3 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/plv8/plv8/blob/r3.2/Changes --- pkgs/servers/sql/postgresql/ext/plv8/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index e0dbc19e353f..2c375babd464 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -15,13 +15,13 @@ let libv8 = nodejs_20.libv8; in stdenv.mkDerivation (finalAttrs: { pname = "plv8"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; rev = "v${finalAttrs.version}"; - hash = "sha256-azO33v22EF+/sTNmwswxyDR0PhrvWfTENuLu6JgSGJ0="; + hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs="; }; patches = [ @@ -135,6 +135,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; + changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes"; maintainers = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.postgresql; From d055dc25db736d1dd055766752c28ed3a732469f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 25 Oct 2024 20:03:37 +0200 Subject: [PATCH 108/215] postgresqlPackages.pg_topn: 2.6.0 -> 2.7.0 Makes building with PostgreSQL 17 succeed. Changelog: https://github.com/citusdata/postgresql-topn/blob/master/CHANGELOG.md#topn-v270-october-18-2024 --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 2a11417c9083..b210db910411 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.6.0"; + version = "2.7.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kq3P+a9NWLKN/CsISGHfInbeL4ex4KIeDhTKyyN7FVE="; + sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; }; installPhase = '' From 1b19f8df556d9fd84b46218d0afed59c36844510 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 21:46:28 +0200 Subject: [PATCH 109/215] postgresql16Packages.pg_ed25519: mark as broken on darwin Broken on linux (JIT) as well. --- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 010f8f819da9..57bf1b62e15f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.renzo ]; platforms = postgresql.meta.platforms; license = licenses.mit; + # Broken on darwin and linux (JIT) with no upstream fix available. + broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang; }; } From 9789c756bff1b923a5c1e420c4fd251896bb8e26 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 29 Sep 2024 21:46:54 +0200 Subject: [PATCH 110/215] postgresql16Packages.smlar: mark as broken on darwin Broken on linux (JIT) as well. --- pkgs/servers/sql/postgresql/ext/smlar.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 12fdd79cc8f4..4188c3b9c99a 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -26,5 +26,7 @@ stdenv.mkDerivation rec { platforms = postgresql.meta.platforms; license = licenses.bsd2; maintainers = [ ]; + # Broken on darwin and linux (JIT) with no upstream fix available. + broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang; }; } From 4cc4534295812864ed8dab03537288fd3a3f3e5d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 28 Sep 2024 21:36:28 +0200 Subject: [PATCH 111/215] postgresql_17: init at 17.0 --- pkgs/servers/sql/postgresql/17.nix | 6 ++++++ pkgs/servers/sql/postgresql/default.nix | 1 + pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 ++++ pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ++++ pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++++ pkgs/servers/sql/postgresql/generic.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 6 +++++- 7 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/17.nix diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix new file mode 100644 index 000000000000..5d8d8cd693c2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/17.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + version = "17.0"; + hash = "sha256-fidhMcD91rYliNutmzuyS4w0mNUAkyjbpZrxboGRCd4="; + # TODO: Add dont-use-locale-a-on-musl.patch once Alpine Linux has PostgreSQL 17. + # MR in: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72853 +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 3040e8074b32..8eb20188651f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -14,6 +14,7 @@ let postgresql_14 = ./14.nix; postgresql_15 = ./15.nix; postgresql_16 = ./16.nix; + postgresql_17 = ./17.nix; }; mkAttributes = jitSupport: diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index afc5b9fe6506..8983acb3152a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -2,6 +2,10 @@ let source = { + "17" = { + version = "1.7.0"; + hash = "sha256-MNQMePDmGxC8OFIJuVJrhfgU566vkng00+tjeGpGKvs="; + }; "16" = { version = "1.6.0"; hash = "sha256-lg7N0QblluTgtNo1tGZjirNJSyQXtcAEs9Jqd3zx0Sg="; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 6637c98c9565..4aeec3e31f09 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -21,6 +21,10 @@ with { version = "1.5"; sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; + "17" = { + version = "1.5"; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; }."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index f4c03d611f50..1079a13b2dfc 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -2,6 +2,10 @@ let source = { + "17" = { + version = "17.0"; + hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro="; + }; "16" = { version = "16.0"; hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc="; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 07cff1a1adae..4054d8adde1d 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -5,7 +5,7 @@ let { stdenv, lib, fetchurl, fetchpatch, makeWrapper , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin - , linux-pam + , linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt , removeReferencesTo, writeShellApplication @@ -117,7 +117,8 @@ let pkg-config removeReferencesTo ] - ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ]; + ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ] + ++ lib.optionals (atLeast "17") [ bison flex perl docbook_xml_dtd_45 docbook-xsl-nons libxslt ]; enableParallelBuilding = true; @@ -153,7 +154,8 @@ let ++ lib.optionals stdenv'.hostPlatform.isLinux [ "--with-pam" ] # This could be removed once the upstream issue is resolved: # https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de - ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]; + ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ] + ++ lib.optionals (atLeast "17") [ "--without-perl" ]; patches = [ (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) @@ -166,7 +168,7 @@ let src = ./patches/locale-binary-path.patch; locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) - + ] ++ lib.optionals (olderThan "17") [ # TODO: Remove this with the next set of minor releases (fetchpatch ( if atLeast "14" then { @@ -182,7 +184,7 @@ let hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw="; excludes = [ "doc/*" ]; }) - ) + ) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7d3dfb91154..435974b4cf08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24867,12 +24867,14 @@ with pkgs; postgresql_14 postgresql_15 postgresql_16 + postgresql_17 postgresql_12_jit postgresql_13_jit postgresql_14_jit postgresql_15_jit postgresql_16_jit + postgresql_17_jit ; postgresql = postgresql_16; postgresql_jit = postgresql_16_jit; @@ -24882,12 +24884,14 @@ with pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; + postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; + postgresql17Packages = recurseIntoAttrs postgresql_17.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; - postgresql16Packages = postgresqlPackages; + postgresql17JitPackages = recurseIntoAttrs postgresql_17_jit.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From 367ccf08fcc8d4b6bf108ddc8f471d837f76cf2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 14:19:07 +0000 Subject: [PATCH 112/215] dnsmonster: 0.9.9 -> 1.0.0 --- pkgs/tools/networking/dnsmonster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index 0b32a8c90869..01121f001e55 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dnsmonster"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mosajjal"; repo = pname; rev = "v${version}"; - hash = "sha256-2k/WyAM8h2P2gCLt2J9m/ZekrzCyf/LULGOQYy5bsZs="; + hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM="; }; - vendorHash = "sha256-gAjR1MoudBAx1dxGObIVPqJdfehWkKckKtwM7sTP0w4="; + vendorHash = "sha256-QCG/rhs4Y3lLDVU15cBNUZqbKc4faNAqKMhMOFwK2SY="; buildInputs = [ libpcap From 80027016477355f39977a78404ae0dd51ea3d724 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 14:24:52 +0000 Subject: [PATCH 113/215] asciigraph: 0.7.2 -> 0.7.3 --- pkgs/tools/text/asciigraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 46166d8c6370..1b88b5041f14 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "asciigraph"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI="; + sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg="; }; vendorHash = null; From bf7ee82344a3efc35e32b581c281b25413b18630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 16:47:47 +0200 Subject: [PATCH 114/215] cpuid: 20240324 -> 20241023 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index d74d25398f64..e656212991f9 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20240324"; + version = "20241023"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-3fvFudgBUbsEl16d7BMFEDQZeY0i7/LiRJCD3AhiGEw="; + sha256 = "sha256-/HdDWo1dKzVRcTMB6M24PmKjz+3IQTKw7JsbteUkT9w="; }; # For pod2man during the build process. From b7c125feacbfdc4146344eb60b9a5c875aefe70c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Oct 2024 15:42:34 +0100 Subject: [PATCH 115/215] diffoscope: 279 -> 282 Changes: - https://diffoscope.org/news/diffoscope-280-released/ - https://diffoscope.org/news/diffoscope-281-released/ - https://diffoscope.org/news/diffoscope-282-released/ --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1dc01c72faae..fc85e55b6630 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -102,11 +102,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "279"; + version = "282"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-mP/l1/lFklFDBhXvnBjbcS8LZYqtfuCcG5SlD75RC/o="; + hash = "sha256-hp1SW9vHBZnlSNKCKW7AUPheyMntxvrPo0McDHZw96c="; }; outputs = [ From 65648a8f164edcfd0c177a2feca343f96ff9b383 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Sat, 26 Oct 2024 18:43:01 +0700 Subject: [PATCH 116/215] fcitx5-mozc: attempt to fix tests Co-authored-by: h7x4 --- pkgs/by-name/fc/fcitx5-mozc/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fc/fcitx5-mozc/package.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix index b455db820e84..43535fd93545 100644 --- a/pkgs/by-name/fc/fcitx5-mozc/package.nix +++ b/pkgs/by-name/fc/fcitx5-mozc/package.nix @@ -9,6 +9,7 @@ nixosTests, pkg-config, python3, + stdenv, unzip, }: @@ -122,7 +123,7 @@ buildBazelPackage { ''; }; - passthru.tests = { + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) fcitx5; }; From a8aecfa2c340ef96da5d9b321aafd83c2baefafe Mon Sep 17 00:00:00 2001 From: Joonas Rautiola Date: Sat, 26 Oct 2024 19:51:38 +0300 Subject: [PATCH 117/215] maintainers: add joinemm --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fed81e98a0ff..7c0cf0ff2139 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10494,6 +10494,13 @@ githubId = 168684553; name = "João Marques"; }; + joinemm = { + email = "joonas@rautiola.co"; + github = "joinemm"; + githubId = 26210439; + name = "Joonas Rautiola"; + keys = [ { fingerprint = "87EC DD30 6614 E510 5299 F0D4 090E B48A 4669 AA54"; } ]; + }; jojosch = { name = "Johannes Schleifenbaum"; email = "johannes@js-webcoding.de"; From a8637d29a293facfdf22ce127f7ec3abbe4c5e5c Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Sat, 26 Oct 2024 21:25:29 +0200 Subject: [PATCH 118/215] perlPackages.ReturnMultiLevel: init at 0.08 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1d40ccc835b..0a948c5f2ec5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22105,6 +22105,21 @@ with self; { }; }; + ReturnMultiLevel = buildPerlPackage { + pname = "Return-MultiLevel"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Return-MultiLevel-0.08.tar.gz"; + hash = "sha256-UbGu8wxcQAn2QCZ6CFiSEuh9zRAYAPDSD5xjXJ/+iKE="; + }; + buildInputs = [ TestFatal ]; + meta = { + homepage = "https://metacpan.org/pod/Return::MultiLevel"; + description = "Return across multiple call levels"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ReturnValue = buildPerlPackage { pname = "Return-Value"; version = "1.666005"; From 8af6d0cea6f1b2dd2b7925bd34e7f38754212454 Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Sat, 26 Oct 2024 21:27:07 +0200 Subject: [PATCH 119/215] perlPackages.TestExit: init at 0.11 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0a948c5f2ec5..9e19e56df595 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25054,6 +25054,20 @@ with self; { }; }; + TestExit = buildPerlPackage { + pname = "Test-Exit"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Test-Exit-0.11.tar.gz"; + hash = "sha256-+9qS034EgdGO68geSNAlIotXGExZstWm9r34cELox7I="; + }; + propagatedBuildInputs = [ ReturnMultiLevel ]; + meta = { + description = "Test whether code exits without terminating testing"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestExpect = buildPerlPackage { pname = "Test-Expect"; version = "0.34"; From 2f5d739cfeb60fd803433b30a85e9c3c4f3de208 Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Sat, 26 Oct 2024 21:30:12 +0200 Subject: [PATCH 120/215] perlPackages.AppSqitch: 1.4.0 -> 1.4.1 --- pkgs/top-level/perl-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9e19e56df595..a007e54fab50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -992,15 +992,14 @@ with self; { }; AppSqitch = buildPerlModule { - version = "1.4.0"; + version = "1.4.1"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.0.tar.gz"; - hash = "sha256-sNs4cDH3dWJmLgA7xV16EComOAtK1/25qKO61XaeUBw="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.1.tar.gz"; + hash = "sha256-yvMcyPdy46TJ1LP/Oo9oSm61sbPCYfTdwPkKiMNgB8Y="; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; - doCheck = false; # Can't find home directory. + buildInputs = [ CaptureTiny TestExit TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl AlgorithmBackoff ]; meta = { description = "Sensible database change management"; homepage = "https://sqitch.org"; From 4cdef761253dfdd4c14821ce121a592a5186db31 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 26 Oct 2024 17:15:04 +0200 Subject: [PATCH 121/215] htop: backport configuration path fix See https://github.com/htop-dev/htop/pull/1412 This is useful if the htop configuration is managed by something like Home Manager. Signed-off-by: Sefa Eyeoglu --- pkgs/tools/system/htop/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c0a689c4c621..e9e1b2db6754 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook, pkg-config +{ lib, fetchFromGitHub, fetchpatch2, stdenv, autoreconfHook, pkg-config , ncurses , IOKit , libcap @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { hash = "sha256-qDhQkzY2zj2yxbgFUXwE0MGEgAFOsAhnapUuetO9WTw="; }; + patches = [ + # See https://github.com/htop-dev/htop/pull/1412 + # Remove when updating to 3.4.0 + (fetchpatch2 { + name = "htop-resolve-configuration-path.patch"; + url = "https://github.com/htop-dev/htop/commit/0dac8e7d38ec3aeae901a987717b5177986197e4.patch"; + hash = "sha256-Er1d/yV1fioYfEmXNlLO5ayAyXkyy+IaGSx1KWXvlv0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config ; From 925537f0d4e02cc311b2892988afc4d37d67a7ff Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 26 Oct 2024 21:55:49 +0200 Subject: [PATCH 122/215] chromium,chromedriver: 130.0.6723.58 -> 130.0.6723.69 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_22.html This update includes 3 security fixes. CVEs: CVE-2024-10229 CVE-2024-10230 CVE-2024-10231 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 448a50432448..6e385ef01736 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-YndBzhUNmn5tJdCqLmpUrs2WBXXpTxiKCNczWEz6DU4="; + hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI="; hash_darwin_aarch64 = - "sha256-taG58kMgQUD40aGqnyx9O9e9m4qGsTWX57cjD3NeHm4="; - hash_linux = "sha256-raWGzhjqWdm5bRK+Z7Qga8QM9kQYSXxdL5N+wk1hlXI="; - version = "130.0.6723.58"; + "sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw="; + hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo="; + version = "130.0.6723.69"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-09-09"; }; }; - hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; - version = "130.0.6723.58"; + hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; + version = "130.0.6723.69"; }; ungoogled-chromium = { deps = { From 4e52baa7e2b13b143bf4b22bb8b505b916c99785 Mon Sep 17 00:00:00 2001 From: LoC Date: Sat, 26 Oct 2024 18:45:35 +0200 Subject: [PATCH 123/215] maintainers: add loc --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 76d7164710bd..daf87dcea90d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12390,6 +12390,13 @@ githubId = 169170; name = "Mathias Schreck"; }; + loc = { + matrix = "@loc:locrealloc.de"; + github = "LoCrealloc"; + githubId = 64095253; + name = "LoC"; + keys = [ { fingerprint = "DCCE F73B 209A 6024 CAE7 F926 5563 EB4A 8634 4F15"; } ]; + }; locallycompact = { email = "dan.firth@homotopic.tech"; github = "locallycompact"; From 164adcf0bc363637eaff7075922fb8f2750edef9 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sun, 27 Oct 2024 01:43:30 +0800 Subject: [PATCH 124/215] perlPackages.Appperlbrew: 0.98 -> 1.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e00010578e4..2b4e6807b911 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -959,10 +959,10 @@ with self; { Appperlbrew = buildPerlModule { pname = "App-perlbrew"; - version = "0.98"; + version = "1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.98.tar.gz"; - hash = "sha256-oWD3ESJYjdU12pTbsLgwHkjlONJaRCobE/cZCWKIWTI="; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-1.00.tar.gz"; + hash = "sha256-PKNFnK6f/VHef2i95CEtBx1hOLZEUo9izJDHikhSyss="; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; From 9057c54f5b0b3ada9a6d6a93eac822c86ea2de8a Mon Sep 17 00:00:00 2001 From: Ming-Chuan Date: Sat, 26 Oct 2024 14:03:21 -0700 Subject: [PATCH 125/215] streamcontroller: 1.5.0-beta.6-unstable-2024-08-13 -> 1.5.0-beta.7 --- pkgs/by-name/st/streamcontroller/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix index 830bc1229052..71e2a2ee65d1 100644 --- a/pkgs/by-name/st/streamcontroller/package.nix +++ b/pkgs/by-name/st/streamcontroller/package.nix @@ -16,15 +16,13 @@ stdenv.mkDerivation rec { pname = "streamcontroller"; - # Note that the latest tagged version (1.5.0-beta.6) includes a python dependency - # that doesn't exist anymore, so we package an unstable version instead. - version = "1.5.0-beta.6-unstable-2024-08-13"; + version = "1.5.0-beta.7"; src = fetchFromGitHub { repo = "StreamController"; owner = "StreamController"; - rev = "dbb6460a69137af192db09d504224ae9f1127cbd"; - hash = "sha256-+YYzHLRU5MNjF3iaKIDj9k4PVg+vnEZhbc3ZmNI7xyw="; + rev = version; + hash = "sha256-UBcsA9pAo7fONhk4vYXQU4EgSVKm1D7/7nvL9BaNIgo="; }; # The installation method documented upstream From 8fb88e7a67def45012935486d700eb539ee9bfbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 21:17:21 +0000 Subject: [PATCH 126/215] brev-cli: 0.6.293 -> 0.6.295 --- pkgs/development/misc/brev-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 74da4320deb5..5de9127f4e9f 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.293"; + version = "0.6.295"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XRzwLPUNUSf88GqwdI8/WuodFVdoHuY8k6GYBgUco20="; + sha256 = "sha256-sdf74TsDVwCpL+2XQl64Z7tIIuM60XW9nLfAjuy5yZ0="; }; - vendorHash = "sha256-oVs7CFnijmyaQAEoYuKf56n+i2q9YMjq4HatbpWympw="; + vendorHash = "sha256-ZlL4Ts+3lZhxSkg0QlCJHtl3bg3t3nQRVIDD6GaOJnE="; CGO_ENABLED = 0; subPackages = [ "." ]; From dadeac0a1a5d9fc30a756bb1a676d7576605f5b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 18:40:07 +0000 Subject: [PATCH 127/215] nvc: 1.14.0 -> 1.14.1 --- pkgs/applications/science/electronics/nvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 0c557fbeca3e..0ec5dcb683a5 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw="; + hash = "sha256-EPnHm2bZCui8K/H1a6+pgec3Lrf+zAlFoKYBnLspdQQ="; }; nativeBuildInputs = [ From 65739f07c3ea7509c80faf1586b93514dc96fed9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 23:54:35 +0200 Subject: [PATCH 128/215] python312Packages.types-aiobotocore: 2.15.1 -> 2.15.2 --- pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 29fffba265bc..75215f8a8ee3 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.15.1"; + version = "2.15.2"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-DW7QyEVvvlnew0WqFCgA2wg3uYvKHtX2jPbvbVITd0U="; + hash = "sha256-Y+akVszDPiyjUKrliM/bu5S97PNTPmqFePc2xbK4Vgc="; }; build-system = [ setuptools ]; From 369c239aff40084884130e6231d291f151d5d8a0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 26 Aug 2024 23:05:38 +0200 Subject: [PATCH 129/215] kando: init at 1.4.0 --- pkgs/by-name/ka/kando/package.nix | 152 ++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 pkgs/by-name/ka/kando/package.nix diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix new file mode 100644 index 000000000000..5456a4bd8b46 --- /dev/null +++ b/pkgs/by-name/ka/kando/package.nix @@ -0,0 +1,152 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + overrideSDK, + + electron, + nodejs, + + cmake, + zip, + makeWrapper, + wayland-scanner, + copyDesktopItems, + makeDesktopItem, + + libxkbcommon, + libX11, + libXtst, + libXi, + wayland, + darwin, +}: + +let + buildNpmPackage' = buildNpmPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; +in +buildNpmPackage' rec { + pname = "kando"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "kando-menu"; + repo = "kando"; + rev = "refs/tags/v${version}"; + hash = "sha256-JcPTplqrMgDsT0HDTh7liChUWvLqe9gwS51ANM3Wsds="; + }; + + npmDepsHash = "sha256-13NuhGq5Pv5GSLeXASWxbXZYaUb9KzMgR7y5I7mv+MA="; + + npmFlags = [ "--ignore-scripts" ]; + + makeCacheWritable = true; + + nativeBuildInputs = + [ + cmake + zip + makeWrapper + ] + ++ lib.optionals stdenv.isLinux [ + wayland-scanner + copyDesktopItems + ]; + + buildInputs = + lib.optionals stdenv.isLinux [ + libxkbcommon + libX11 + libXtst + libXi + wayland + ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; + + dontUseCmakeConfigure = true; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # use our own node headers since we skip downloading them + NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node"; + # disable code signing on Darwin + CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.isDarwin "false"; + }; + + postConfigure = '' + # electron files need to be writable on Darwin + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + pushd electron-dist + zip -0Xqr ../electron.zip . + popd + + rm -r electron-dist + + # force @electron/packager to use our electron instead of downloading it, even if it is a different version + substituteInPlace node_modules/@electron/packager/dist/packager.js \ + --replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"' + + # don't fetch node headers + substituteInPlace node_modules/cmake-js/lib/dist.js \ + --replace-fail '!this.downloaded' 'false' + ''; + + # we used --ignore-scripts to have time to patch the dependencies + # now we'll have to call npm rebuild manually + preBuild = '' + npm rebuild --verbose + ''; + + npmBuildScript = "package"; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/kando + cp -r out/*/{locales,resources{,.pak}} $out/share/kando + + install -Dm644 assets/icons/icon.svg $out/share/icons/hicolor/scalable/apps/kando.svg + + makeWrapper ${lib.getExe electron} $out/bin/kando \ + --add-flags $out/share/kando/resources/app \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r out/*/Kando.app $out/Applications + makeWrapper $out/Applications/Kando.app/Contents/MacOS/Kando $out/bin/kando + ''} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "kando"; + exec = "kando %U"; + icon = "kando"; + desktopName = "Kando"; + genericName = "Pie Menu"; + comment = "The Cross-Platform Pie Menu"; + categories = [ "Utility" ]; + }) + ]; + + meta = { + changelog = "https://github.com/kando-menu/kando/releases/tag/v${version}"; + description = "Cross-Platform Pie Menu"; + homepage = "https://github.com/kando-menu/kando"; + license = lib.licenses.mit; + mainProgram = "kando"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = electron.meta.platforms; + }; +} From 7b391f6c515dd0c3a6eb2c4c5aea5b74ee4ca814 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 00:09:22 +0200 Subject: [PATCH 130/215] python312Packages.types-aiobotocore: use nix hash convert --- pkgs/development/python-modules/types-aiobotocore/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index ea5b05fdaacd..a3449d2b4347 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -371,7 +371,7 @@ for package in "${packages[@]}"; do url="https://pypi.io/packages/source/t/${package}/${package//-/_}-${version}.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sri_hash="$(nix hash to-sri --type sha256 $hash)" + sri_hash="$(nix hash convert --hash-algo sha256 --to sri $hash)" package_short="${package#types-aiobotocore-}" awk -i inplace -v pkg="$package" -v pkg_short="$package_short" -v ver="$version" -v hash="$sri_hash" ' From 82bb21d050b7ff419f18ab6663aae89d81e18126 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 00:23:50 +0200 Subject: [PATCH 131/215] python312Packages.types-aiobotocore-*: 2.15.1 -> 2.15.2 --- .../types-aiobotocore-packages/default.nix | 1372 ++++++++--------- 1 file changed, 686 insertions(+), 686 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 230615d276d0..e7272708faea 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -60,1392 +60,1392 @@ let in rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.15.1" - "sha256-DALSwzPriQHPReCA4DxiqDE4egt1d0kVadDLqXSEV6k="; + buildTypesAiobotocorePackage "accessanalyzer" "2.15.2" + "sha256-phl4/2H/Eca6fAEMRwF243B2tuzXYOofiWCFBmX8zAk="; types-aiobotocore-account = - buildTypesAiobotocorePackage "account" "2.15.1" - "sha256-7VNgcslaFFeprI+G9Owfj24o8CFmGxqct4QWSGgxwI8="; + buildTypesAiobotocorePackage "account" "2.15.2" + "sha256-k66NAKboMyLeFnpnsDTY6i2BP7GRRWgALmva/JRtOzo="; types-aiobotocore-acm = - buildTypesAiobotocorePackage "acm" "2.15.1" - "sha256-ItdsLbXVs92zb9JDwuHHvYVKArUAAeDUdt6tPxNikV0="; + buildTypesAiobotocorePackage "acm" "2.15.2" + "sha256-eLo4G5qHs9BxcuYxJUszMHxSFegzAiMmsFZO1DdVnQk="; types-aiobotocore-acm-pca = - buildTypesAiobotocorePackage "acm-pca" "2.15.1" - "sha256-JSvY8qqA91SUMXs7ajfVQ6wZFNHc2XisO2haiygJg8o="; + buildTypesAiobotocorePackage "acm-pca" "2.15.2" + "sha256-Q2LW9rHXP78eKyfNN9b7c7YDeM/f/GnzbeGZJ4TDWGA="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; types-aiobotocore-amp = - buildTypesAiobotocorePackage "amp" "2.15.1" - "sha256-RJKzIa6b/ov0xpayGBgDVW2DUjIo0xNfDDh2hAvK918="; + buildTypesAiobotocorePackage "amp" "2.15.2" + "sha256-Qit4RmUHdSIcbOEQOsSZW6ARdx/S/b9qpfJxgMCP6uM="; types-aiobotocore-amplify = - buildTypesAiobotocorePackage "amplify" "2.15.1" - "sha256-TNhrmgAjuJLBLXU2dlp+Ri8pJ+swgjXu1lJFGUnLEfQ="; + buildTypesAiobotocorePackage "amplify" "2.15.2" + "sha256-Omrz8qlW74Yv69ElHjCpab0X4PAQ9vWc/L9JIyM6uwk="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.15.1" - "sha256-T2mqIUobrEepz6vS/VLWq8OpUZTYRMme0SgWv+UtxmQ="; + buildTypesAiobotocorePackage "amplifybackend" "2.15.2" + "sha256-amNBmVDOA6sIEWU0K/wpQWh9q1QzNLpuqf7vEzRvouE="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.1" - "sha256-oFgte9lbXb9IM3Ezn0Jmd5djrLwgJLqeDePdBb5OZrI="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.2" + "sha256-uCh6W8IWBmDIYCxqdbt5PBmd/iId5u5GGUG9tjL7W2w="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.15.1" - "sha256-3gDSD6Z28yicogEeDv2i/rcmh7X9nRWrwxRL0YFZIpc="; + buildTypesAiobotocorePackage "apigateway" "2.15.2" + "sha256-+8fuio9+dP2IqQJn+t2dshAdNyayQypdQNjefhDhRjo="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.1" - "sha256-3NC66/pp4F8GsH40z0mBoaLqIKyPHGpgEAGgOnOOAGI="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.2" + "sha256-Z/ib8krZwZ03DoQS/zyB6jKet0+gmTBkOHUew/i0A+4="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.15.1" - "sha256-qsiFXNECUVFDrreYOi2MLa655WAECXuPqi11z8liVN4="; + buildTypesAiobotocorePackage "apigatewayv2" "2.15.2" + "sha256-6Y8A/y30axUzYREdgLWH92gIG4pWvNkWKOxoTfYRQVw="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.15.1" - "sha256-QPhmF5urmZBb+e7KAIJihDujuDAopgQqrBspAxD6YJ4="; + buildTypesAiobotocorePackage "appconfig" "2.15.2" + "sha256-I8fTll4jIngD0UHqRx4WhM+WPXuvepHvXByYlgHSrDE="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.15.1" - "sha256-1rQCSuTShglGMwqcxiVULSbmgzpUZmubTgqlum5EeqE="; + buildTypesAiobotocorePackage "appconfigdata" "2.15.2" + "sha256-KfmKk/d1ZXcGeYvzqlJh43uHiQvsXzbyytybvEUcVbI="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.15.1" - "sha256-l/dJepTAEpsV3eJWzMbw43SrqgWuL1I3IVlVQQzZPSM="; + buildTypesAiobotocorePackage "appfabric" "2.15.2" + "sha256-+BNkaM4f+DRqiSmY0uHksGTTbU7pBuJt+y8S2GRUkdg="; types-aiobotocore-appflow = - buildTypesAiobotocorePackage "appflow" "2.15.1" - "sha256-v30RZvCTHOMxsypX+Id5W7VEPC4QFYvRklPu9zaJ9x4="; + buildTypesAiobotocorePackage "appflow" "2.15.2" + "sha256-aVprs4EiYNo4+VdzQAPE8/UYMebQDYDcTjEBGAN+PdQ="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.15.1" - "sha256-ceiFklxI0RK06gj2ZQcvpGyW903SOxXA654MzRy3A7U="; + buildTypesAiobotocorePackage "appintegrations" "2.15.2" + "sha256-BbhuY9g4oUnBBhoo75bVpNZRWeGDYCl5kwKlW7X3Ek0="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.15.1" - "sha256-P9XULdNPREbu2xksZXIIxZUEggYlU3j0Jo7RzFKMawk="; + buildTypesAiobotocorePackage "application-autoscaling" "2.15.2" + "sha256-ggg7zdytM3/Gz5mTQCFCHG8NVfj+q79Wt0B/LEgSfvA="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.15.1" - "sha256-nvNJsUkMwJd41vlj7pKEn37f1Ab4l4WAJbYGqfxCmZw="; + buildTypesAiobotocorePackage "application-insights" "2.15.2" + "sha256-uGVDVNNBV7vzhsBStrEGq4EKvhp/pbcS00becWLM35E="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.1" - "sha256-/rMS/1K9dGzW89Rzd6sg9o/L56kNAO0bkDUTNKsKxxI="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.2" + "sha256-FvfKD+vSV4jYk62NFDqHwXNaScqQL7uxv9QhnJ5zNEI="; types-aiobotocore-appmesh = - buildTypesAiobotocorePackage "appmesh" "2.15.1" - "sha256-yPEPmU3CVzddnsFd2CQp+eAji1+/bH/Vvhv6D2JbjvM="; + buildTypesAiobotocorePackage "appmesh" "2.15.2" + "sha256-t96fm5t8s6XeeyUcAF93aVdU+Zu9flGKTQBtR0wsQ1Y="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.15.1" - "sha256-gzzXHrMC0MF9RykwGmZiUtgufuRPrmGekVicXzdlFw8="; + buildTypesAiobotocorePackage "apprunner" "2.15.2" + "sha256-irCvrU+nnmWTvP+r4kVnSTz8QEFJvPCJ9MKXECikMgs="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.15.1" - "sha256-qbiOK2G95NdBTt1AmrQsDJbz885ugrdRBXMb9ZQcssE="; + buildTypesAiobotocorePackage "appstream" "2.15.2" + "sha256-iGmu1EKY9YXFIzLqoya+oTc0CjGw4zoKdnmZG5OTYX0="; types-aiobotocore-appsync = - buildTypesAiobotocorePackage "appsync" "2.15.1" - "sha256-WYgJ2GLOxy/Va+ZY7DwwX7pBFF4zv1iQ8rptFoOlFsA="; + buildTypesAiobotocorePackage "appsync" "2.15.2" + "sha256-82XUaNGcXO6P9w1ai0yg788yn3eTZ5G5+U1CiIEMvhQ="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.1" - "sha256-9lToTikNN5kH9TCGSeQDnm6g2iM+1OGbtSpN4f6M7FM="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.2" + "sha256-h96kwgdTwldKgyBxy/K2nO0eRp+dsx/Zms9ZJm2jgoA="; types-aiobotocore-athena = - buildTypesAiobotocorePackage "athena" "2.15.1" - "sha256-8NEZDefM/mP11YPnOCn11QfbWAMaCB5Yh2R9zQRtPpw="; + buildTypesAiobotocorePackage "athena" "2.15.2" + "sha256-L6dfltBPK+6TBs5bfrQtYoaXEzTp4h7Z1YGpThrU2mU="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.15.1" - "sha256-JU7s8pqfJQptll0Kh3KPDeFULM2cga0nYZSvhLk2ul4="; + buildTypesAiobotocorePackage "auditmanager" "2.15.2" + "sha256-zaO6TuUySzlKPc5SizuSFtK25LjCQCyDF/oUcfYSb9Q="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.15.1" - "sha256-PddQSNJ9KNGL8LQDD82+IeD4cVCR7huBkSWTqbYQfUk="; + buildTypesAiobotocorePackage "autoscaling" "2.15.2" + "sha256-L/EIaJrRPfNzwOEeJaR+E4c1niLpjBcnFYsWxcyfnkM="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.15.1" - "sha256-hUEFUNC1WdPpdu+9AQFWLvFhvBrmy3Xg7Xl4LlB4z6k="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.15.2" + "sha256-X5Qi6TWVeKi5URcHkEyi1AzyFuZADgNxUFJmtbeRqrQ="; types-aiobotocore-backup = - buildTypesAiobotocorePackage "backup" "2.15.1" - "sha256-E8LmUYpLqVF0WooWUXtqv4nhst1o050tx3/sRDBhd+w="; + buildTypesAiobotocorePackage "backup" "2.15.2" + "sha256-56zIY48+BtCInvbY9qtOVgIijam4suphFS8EHQak+iE="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.15.1" - "sha256-Yx/e2UIEzn47L4mQ61S0PkHBuDbz7uqc5yIw/6XrBkI="; + buildTypesAiobotocorePackage "backup-gateway" "2.15.2" + "sha256-1UIYMYwvmTlGqRoKSoLb7A3W4Ll/WfL7wm3G+kI1GJs="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; types-aiobotocore-batch = - buildTypesAiobotocorePackage "batch" "2.15.1" - "sha256-vZJddKOLsljDKP4WrUDZrc4hkk01FtN3wL8MXKpfuII="; + buildTypesAiobotocorePackage "batch" "2.15.2" + "sha256-iu0r4+edD0r5ZJEngGp9W+DiFYiyBXiPdQJk8bRzpU8="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.15.1" - "sha256-sbgwQEs21yd+xl2AuEiYEzc0Lgx7Uo/Ctibd2SEHY0c="; + buildTypesAiobotocorePackage "billingconductor" "2.15.2" + "sha256-KGnqy6p/63nN613xm8gBGtFHrGEo21kmD1q/GngIStM="; types-aiobotocore-braket = - buildTypesAiobotocorePackage "braket" "2.15.1" - "sha256-CThsP2a03VbAIFr4x2x0L2fLgIxvqFV1MuMLp1eoo6A="; + buildTypesAiobotocorePackage "braket" "2.15.2" + "sha256-NAcGzPa4k+aAuSReMXK33wKMyaiPP4OCdyCfKmG//Ao="; types-aiobotocore-budgets = - buildTypesAiobotocorePackage "budgets" "2.15.1" - "sha256-b1M6ZdlrG/AM3h5iM/mMAW7SrwrjApF/K0kgbFpAM14="; + buildTypesAiobotocorePackage "budgets" "2.15.2" + "sha256-NA0KUMPOrSgXU3ZQ7BcM+gYzfCPbYZecEmckOaWNJKQ="; types-aiobotocore-ce = - buildTypesAiobotocorePackage "ce" "2.15.1" - "sha256-MV6dma7+hf1ITv3HJ4cJZyfpimMT5MBuspTCEjMix7I="; + buildTypesAiobotocorePackage "ce" "2.15.2" + "sha256-F8Ve+ImFP00125yzh/wQJGFlXMi7ruP+SLg8dgwFleg="; types-aiobotocore-chime = - buildTypesAiobotocorePackage "chime" "2.15.1" - "sha256-24ukZo0shYVOz0HlrIj0g/xsfKz48fZHlUqcuTFvSoE="; + buildTypesAiobotocorePackage "chime" "2.15.2" + "sha256-dtMLfqQNQNJibTPaZI/quovDdWtAKdB3SS2e7PIs7Gk="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.1" - "sha256-/R22nTYf7XQBH9u8R10jHqHA4+s2iliX5+pFUyWdaG0="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.2" + "sha256-5UFetlbvMPN1VN862HV5sFvOVcrY2z71ZS31OEXb5uY="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.1" - "sha256-UGogN6rRabJuNokJPeQUol9DOMBbc/pkPL+lRg5GYk0="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.2" + "sha256-KMmwUEJfNZ0iNMPPm2+s0aKDB5EmWxT9urrLDiyZEhM="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.1" - "sha256-EDQ5H7R5U9AQnLy2rkRzSSAkFVzfZiWCqlLqP24wv2g="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.2" + "sha256-7jXpLCcTd5qG6UI8zyZN5ml9D3DsSHWc0KqXhhsyZNI="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.1" - "sha256-7iJ+npfPI64WtlKYPLQUkJsJvhjSKCDbYBWWrv5dHwo="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.2" + "sha256-vkA6I/++bwJ77FBGMrrAuvAp6AEMs/t3nJBVr2/pzD8="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.1" - "sha256-BCj6/x6lnNdUx/FjP8mLzv7zLukjwDQw2/tWrFSuU0A="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.2" + "sha256-fxjfPjiKcmvFJ15ukaP0HNU/PUM6mZROighcq6nuTO4="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.15.1" - "sha256-GbRu1vn7S1bILtKKf75+bR4y7OYQ6WnlUVt0HQqr/8s="; + buildTypesAiobotocorePackage "cleanrooms" "2.15.2" + "sha256-/TD2BimSLmEFw4LfZL6Tve1pBjX4uWlcl/la1S3Gg+c="; types-aiobotocore-cloud9 = - buildTypesAiobotocorePackage "cloud9" "2.15.1" - "sha256-7r/W5Hbv4J58aqpedt3ehe3E99U74sFiMHo5YnIPvh8="; + buildTypesAiobotocorePackage "cloud9" "2.15.2" + "sha256-2ClX7W0zE2+UHZiqjaYdfixO0DxXZ9SuzSwkauvgV7A="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.15.1" - "sha256-TwBEzvuYmKyL5Bx2VCZwK0przb4MWhDVqOfl1RF3uog="; + buildTypesAiobotocorePackage "cloudcontrol" "2.15.2" + "sha256-jPndHm2SNwvMB1qkSk5sjdqjbnHZK4zE8XMOEJoMjcw="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.15.1" - "sha256-ApxmZb2xwj0Leynjqi5YC4stEt0qcWQoSq3HffbvL3k="; + buildTypesAiobotocorePackage "clouddirectory" "2.15.2" + "sha256-qq1iH1BAG4P/4hVyniMOiUdq1JUzYS1n/Oo/fmbiGXg="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.15.1" - "sha256-ngI/9VlHFOpAjcXi04JX+MVEdjs1cxC2UT+9MQTblGo="; + buildTypesAiobotocorePackage "cloudformation" "2.15.2" + "sha256-nGq1j9tMJw881JOtWtuDSJk36Nl3gkJD0Zi3Pouo0Bc="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.15.1" - "sha256-+y931CL0UdxZd5dnkSkNBAOmyuXqSb9XdIwQUKoXDTQ="; + buildTypesAiobotocorePackage "cloudfront" "2.15.2" + "sha256-gM3Q02aUPpwbNJbm17BayCPeSA7W1LRqNRyU1T7JYRo="; types-aiobotocore-cloudhsm = - buildTypesAiobotocorePackage "cloudhsm" "2.15.1" - "sha256-Mv6fm2JLK4QVL1dTlVCIM1TaehUSlXTBATHvXHO26uM="; + buildTypesAiobotocorePackage "cloudhsm" "2.15.2" + "sha256-MPSf4e7fvmV7HF0FUNOfaaun7EVKfR/WSz3tu0bdREI="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.15.1" - "sha256-9koftVpoxrFkg/WWYoLZPEf1nnWxqwEeAzeMIJB+n8A="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.15.2" + "sha256-fM4YaHOSjPBL6b6mtulrmliAfi6RaWX4RT01NbE82bY="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.15.1" - "sha256-1s+EM9O5Hfsa0qKK+HFrif2dH+C7+V51MkqvuKeYwyw="; + buildTypesAiobotocorePackage "cloudsearch" "2.15.2" + "sha256-UnjA0HGzLRSag2BK5g3a2f3Ocv5D5qQaSF/BWVv6t5U="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.1" - "sha256-lDC8Za+QGc622FVrsNKPCuitYzU521BC20g7ZGUZMAI="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.2" + "sha256-Kzj6sgsKpqCbuR/Bqvlbj+2k3PSHYPNVs5Ijywir+B8="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.15.1" - "sha256-911ynsQTCCv9kd4TgeWR5Hv8ulz/kCnYxnw9PWk41IY="; + buildTypesAiobotocorePackage "cloudtrail" "2.15.2" + "sha256-D3pSFLhphO5LJuAMpR+YMc9LEr6PreuF0jiCblgx+eg="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.15.1" - "sha256-dh/wbIJ6VTU8++QGXa/IDUCcGpdzBB4jfaizyn9jfyo="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.15.2" + "sha256-Ysfo0oRA28j4vYL2p/XSSlPDka1hWOwIFWaozAxjs4Q="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.15.1" - "sha256-nnyLWvv9esKWKlyZs9j+hUHTCBs55qC8PX5st0OHBxg="; + buildTypesAiobotocorePackage "cloudwatch" "2.15.2" + "sha256-OyeSm/UKHTET9Lcp6pgIDknKJqmDkVwqyC3x2yO1d+E="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.15.1" - "sha256-f8xrPRkEOrw1fFI/q0U//LjzDCymhPOBpqrGPas5te4="; + buildTypesAiobotocorePackage "codeartifact" "2.15.2" + "sha256-PAQ5Vck8tG2x7BK1HBSCwchxubdoTJXduXb4fqSKewQ="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.15.1" - "sha256-9lTVbw1mtKgIiDsI7pc2Lmd7W/1OjMBZtvWTL1mNqxM="; + buildTypesAiobotocorePackage "codebuild" "2.15.2" + "sha256-gi8JQlea6kD/k7C+Vd0KwNU9bfiHFfCdkc/VMqdLsNI="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.15.1" - "sha256-hEASqSTOFl8Pc+qBZ0Xqf36JivPVgHbZ2yZszo5Z9Uo="; + buildTypesAiobotocorePackage "codecatalyst" "2.15.2" + "sha256-A4tsBdng6gf4MdZcB86nOeW7jyBgee7L81Pz4m/rp9s="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.15.1" - "sha256-1L7UGZNkl89ULZV5LiajDZxQmLpelTsjNSvUzUzwk+I="; + buildTypesAiobotocorePackage "codecommit" "2.15.2" + "sha256-Nmr4IFs+HgkkSHct2m//k/6QPX+uMrBZxpGCQu/ktms="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.15.1" - "sha256-HaO/GSX14cKdKlwYmowzgWPfTDrUXyiyNlhz23lPyT8="; + buildTypesAiobotocorePackage "codedeploy" "2.15.2" + "sha256-Oo0U/ymzZx4pm47GnlRsMwXO5WQSKPHKCVLVZ73o+FM="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.1" - "sha256-0vNZTr6RNUv2TjQJ9GZIwe6jTFJH1KgJW82fVERSFIw="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.2" + "sha256-I8W1gWK+HCR1cX+4jRN0bk8IpgACUByK9UCfqKf2H0I="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.15.1" - "sha256-Mk5xbw1OhHcBDhohKu7emIz7c4BkxFA+LRtHrLL/LoQ="; + buildTypesAiobotocorePackage "codeguru-security" "2.15.2" + "sha256-RZkI3thRIWLZgcaupwlyzF1zd0LuLvNv/yDZphoTHT0="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.15.1" - "sha256-i/a6O3B69uPMsJsjW2hxMdLm/q2nvRwTlcpvqg0zcnQ="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.15.2" + "sha256-6cB4PY0c8fB2IbLIa3pw5/0gKs9uc+TvqR20i3eiEbw="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.15.1" - "sha256-2i5cZ7cCy0zt71bTmAZHPCKR8GVutVR2TXeGJIlTQ54="; + buildTypesAiobotocorePackage "codepipeline" "2.15.2" + "sha256-NhB4WUrYN7noWIVGiZX5NVQ7jmr/KbZ/gaIGMwQyCtc="; types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.3" "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.15.1" - "sha256-Qcz4JHpT34WKY0+/CRDavwiI99GCwxA/SBftb6Wi9J0="; + buildTypesAiobotocorePackage "codestar-connections" "2.15.2" + "sha256-6bP69xyRpdGzVeyH1tn7u1hLlTNNhBrNtEEXD28bXzU="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.15.1" - "sha256-qdVJ+6ELs5YKqIV/26Ar2FW4KC3DGofHJ/+xo5xzT3M="; + buildTypesAiobotocorePackage "codestar-notifications" "2.15.2" + "sha256-4q4DTYuoKawQXcPfzupceFTaJfYs7eQZR4T2UBIZTJo="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.15.1" - "sha256-wlpdAHtWZd1l8jYduPT0Dc0LIWxOiiA05uXTpL8fQWo="; + buildTypesAiobotocorePackage "cognito-identity" "2.15.2" + "sha256-7HHA+d6rI6phyN9vj8v8ySfUwRdFtHey3ORUtREDegc="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.15.1" - "sha256-zpuLoNTgcbYQJ0DF52qoPVm7nspMiITQczoREaCtlCI="; + buildTypesAiobotocorePackage "cognito-idp" "2.15.2" + "sha256-rm/slcrINl8WpprLdkZq3TP7LVHqXLFOwa6hHoZqIuQ="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.15.1" - "sha256-XYPt1jgk+BEjDpNH2XHNf0hoOwzewoxqxy+2qjv2dMw="; + buildTypesAiobotocorePackage "cognito-sync" "2.15.2" + "sha256-hwUY83vHarKtrDhBWUQjvEWkjzT98QgIsoWzmSCOZVw="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.15.1" - "sha256-XbQ3BYHXGNb4aKFo+WegaZ8613FiVRdthZ0zU7borjQ="; + buildTypesAiobotocorePackage "comprehend" "2.15.2" + "sha256-MplEELAL+rKGyMxJKEPTFEESi4EP1M48pSAXjFP50rA="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.15.1" - "sha256-3cifXhAhIxxZVRdE0Pt3SmaWwoj75iIpp6ThnLeL+BM="; + buildTypesAiobotocorePackage "comprehendmedical" "2.15.2" + "sha256-B+vdbBPeANdozCD3G4l2qyQi/IiGePBtV1uC/L8YDL8="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.15.1" - "sha256-8awRuy2iD9mYSuLaMrbpu0bZ1HlY9kIrF4/ZY7kECbQ="; + buildTypesAiobotocorePackage "compute-optimizer" "2.15.2" + "sha256-l3wWbiLHsIg4sg8Ktv4P6uOk1qy9v/uI8iC+jyEv0GY="; types-aiobotocore-config = - buildTypesAiobotocorePackage "config" "2.15.1" - "sha256-n8RP98EO8AB0a3zqKlc7TZBttT7bHRV2EFYBy999q4g="; + buildTypesAiobotocorePackage "config" "2.15.2" + "sha256-GjC2wY6iIVssYrZi4Ql03bOgI4azJ8toRMhVmqdaF6g="; types-aiobotocore-connect = - buildTypesAiobotocorePackage "connect" "2.15.1" - "sha256-9AfqyTav6mIPiBrMGP6Rh+ytAS92LdLg/4VdTaSKB6I="; + buildTypesAiobotocorePackage "connect" "2.15.2" + "sha256-18PRUxRrcwq/Nz9eWfrWO1uv7RqfgWrdrzTGpf+Y5KA="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.15.1" - "sha256-qTq+tsvlPDq9LDTNgZuwa1zva17PDm1zBMnDX5nLR1g="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.15.2" + "sha256-FK3HnkkWA8B0PlY/DZUGXPVxpxD25JB3ZNDWMuMJvSA="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.15.1" - "sha256-kIF+sS4RpsmhiuttzwFViHaOLZ5B69O//hwEYGrMfr8="; + buildTypesAiobotocorePackage "connectcampaigns" "2.15.2" + "sha256-gumozHCg1SpV7NUYJ+SJhsSVlSvb0VQsPSCYLxhV8pA="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.15.1" - "sha256-hTUDhtsv5KWOiM9jYrT4/IW+GmnCmWnhMZpoQIClQ3k="; + buildTypesAiobotocorePackage "connectcases" "2.15.2" + "sha256-EIcgQ/i9U0nXJY3S0Cw+T3NdELyy3B1mZ640jn10BCw="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.15.1" - "sha256-ffSs8Z/TQatJDUKmjdclI5DYMf5/EI/uEi8r4EnKFds="; + buildTypesAiobotocorePackage "connectparticipant" "2.15.2" + "sha256-6ieIdjDnzr3CZqYeXhvoEXN5giZBUfab/xLjQYxMESw="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.15.1" - "sha256-5Sa+K+DTpM2YwTfhlufD9MxTk4pv+K1wE9PYKM1zAxw="; + buildTypesAiobotocorePackage "controltower" "2.15.2" + "sha256-les6NCF44cG768lwj7h3GVYGPW3pF7EozUP04DXB3vI="; types-aiobotocore-cur = - buildTypesAiobotocorePackage "cur" "2.15.1" - "sha256-NfY/cGT+ft8bWitgYHbySblXNdYj/c/4p5jr2yOs5+c="; + buildTypesAiobotocorePackage "cur" "2.15.2" + "sha256-9tc5TZx6t46Ppd8gljnFAMu1/mt0asdpMEvHUReTgJ8="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.15.1" - "sha256-fQONh48vGKkr+ICjI3EqKW+jNXH/DSm0a96pTf4JQmk="; + buildTypesAiobotocorePackage "customer-profiles" "2.15.2" + "sha256-5FL2ySDWbh3lUspkWDjk3NNJsknW8iweQub3P/i/vik="; types-aiobotocore-databrew = - buildTypesAiobotocorePackage "databrew" "2.15.1" - "sha256-DNayl61Eorza7nIjjbxbFzs+lIN3oUwpDIImJEMHX7Y="; + buildTypesAiobotocorePackage "databrew" "2.15.2" + "sha256-2hfisDJAqw4fwtrmzil0sr77khsbFUxxCDMg+fr5Y2k="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.15.1" - "sha256-v9bq7ub+8q2NrZtaqWqQh2MSKoGfDBdTVW1qKTSooug="; + buildTypesAiobotocorePackage "dataexchange" "2.15.2" + "sha256-SfQXMRIr07Ig/W9PZxvsYdwyuL7BPCTSLrgcR7KYosI="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.15.1" - "sha256-9hBxeCltGrxtMGuTKTwVp/aHHccnfDKuI0QXv50uKNA="; + buildTypesAiobotocorePackage "datapipeline" "2.15.2" + "sha256-9jC8u1JuVEOXzS4glOhSUHkkHDMUT/IpvOCOlgXORXc="; types-aiobotocore-datasync = - buildTypesAiobotocorePackage "datasync" "2.15.1" - "sha256-z7t65Ioz0NtiToPkTIbYcBjWlJg1rcTIj0u/qmPkhMA="; + buildTypesAiobotocorePackage "datasync" "2.15.2" + "sha256-GpFc9Jp8lpBnVv7KiP+m4opXlbT2GZD/E+FuJIIuM2Q="; types-aiobotocore-dax = - buildTypesAiobotocorePackage "dax" "2.15.1" - "sha256-/NyvlFx8/nOWClB3ZPqTt67yGN2ssYojWukw0S3v274="; + buildTypesAiobotocorePackage "dax" "2.15.2" + "sha256-8+YMDXMzMA5cdOKtLROJMFr9f/GNoVZcq8DPmQGaGyw="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.15.1" - "sha256-DWf6HTvFyMYRiOLQrawp5GwhXniNS9mhwPNyprCYrt0="; + buildTypesAiobotocorePackage "detective" "2.15.2" + "sha256-mhrEwfwNVvz1s//HXYy/afTHgJaM4jKdK2Juo5SDrlU="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.15.1" - "sha256-05IkwZCPZvQGkRya7TdN1huFpMxuR1zxB+b8JSFI/oM="; + buildTypesAiobotocorePackage "devicefarm" "2.15.2" + "sha256-o1MUk2hR7gwZS700rIJcjjUYoBHkO1S1Q2jeXlfT01I="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.15.1" - "sha256-n62US1ENdO1MFljx5zeLx+LblbiJyxefhN2+nlxu2GA="; + buildTypesAiobotocorePackage "devops-guru" "2.15.2" + "sha256-FMt/z56MiTwVuqgC1mfUeGiiv060jAwJ9zRHX3S1Pls="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.15.1" - "sha256-knhkLyC1uPX4KjiFcgFf9ys2hCz38++q55nbnUM3n/Q="; + buildTypesAiobotocorePackage "directconnect" "2.15.2" + "sha256-tMYlYP5grEjERDEIgJf5uW2tOvKQuIZ9i82/27W/1bI="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.15.1" - "sha256-JG/1ZQ9cSCMzqF6CVTIu7EIm0ORbLn3gM8gcCCSRhsQ="; + buildTypesAiobotocorePackage "discovery" "2.15.2" + "sha256-HecRhn7WhVtnhyf2p3/DfR8GZFe7E+FXOB6Tfo4FhQ0="; types-aiobotocore-dlm = - buildTypesAiobotocorePackage "dlm" "2.15.1" - "sha256-Pyi45ZWBuEsb3GoumJkX+c8QnX3J6HobLFqwkm7I0ng="; + buildTypesAiobotocorePackage "dlm" "2.15.2" + "sha256-GPDMhuEywSHsZEb5c75luMAaJ7ezveedU9lNQkLGOzc="; types-aiobotocore-dms = - buildTypesAiobotocorePackage "dms" "2.15.1" - "sha256-wius84bAUyldt84o8qUeBSzajkY8mLco85rI4NAIQcc="; + buildTypesAiobotocorePackage "dms" "2.15.2" + "sha256-ENyOPp9mO5gnHt/93OFdxAZ0j3qnTdrKHhB0wMLTb6I="; types-aiobotocore-docdb = - buildTypesAiobotocorePackage "docdb" "2.15.1" - "sha256-MF8CGeObwgB5LW1o1ynwahm9GZHTvxjlgNXDyFRjpWM="; + buildTypesAiobotocorePackage "docdb" "2.15.2" + "sha256-eR5tTx2QfrujGb2f4m29Ip31DWNqgalboYDVrGFNLmA="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.15.1" - "sha256-+gyO2dno529rxF5Uj1pyQ0+fH1CJK7LJs/U4WIpRIX4="; + buildTypesAiobotocorePackage "docdb-elastic" "2.15.2" + "sha256-q+jMIMYoxDEC+WDY2pqFpyJE8tnc1imKBU0fin17NAg="; types-aiobotocore-drs = - buildTypesAiobotocorePackage "drs" "2.15.1" - "sha256-qtMwQ17MpJ0K7zbKr4dyAGWEfHqfM+wXQe22raG/i1E="; + buildTypesAiobotocorePackage "drs" "2.15.2" + "sha256-kKoZ3i8/bXkoJ5pbj0HVBsYSVwB4eAccmCaPyIPjpp4="; types-aiobotocore-ds = - buildTypesAiobotocorePackage "ds" "2.15.1" - "sha256-qU+5PMZqxbskuB/ubXeigzS5t+A5m0WW0e4NVQjFLO4="; + buildTypesAiobotocorePackage "ds" "2.15.2" + "sha256-tVONjcSBiwyW8Rok6pm+uzU1chwhrlCSVMsIw0Weh1Q="; types-aiobotocore-dynamodb = - buildTypesAiobotocorePackage "dynamodb" "2.15.1" - "sha256-hQt2Htye+VubSHw+2Iz5E8IgzHGwAwmyYEkNI0br7eU="; + buildTypesAiobotocorePackage "dynamodb" "2.15.2" + "sha256-0VYAb1ZzBc23YJ1oKwlWRE0Wb8SBltWBNODxckUEtRU="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.15.1" - "sha256-n2NZxFSH9ymucBLagUAaWDgAN4kDsfKqB2W2ir6aEC8="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.15.2" + "sha256-egDbhJ2SAaw6EQQXGI75x98CBLc+bUyfl8a82RMEmzY="; types-aiobotocore-ebs = - buildTypesAiobotocorePackage "ebs" "2.15.1" - "sha256-nzm7mnREUd6MEHan4cTc0MaorGo/X+eKbGH1/giG16w="; + buildTypesAiobotocorePackage "ebs" "2.15.2" + "sha256-GTCz/fv3NWAD57dhqeGJYYLqQlTYx9eHGCwhKF3xKTQ="; types-aiobotocore-ec2 = - buildTypesAiobotocorePackage "ec2" "2.15.1" - "sha256-QzPGQirl2zA5m2yqqXjUC8MIsUDbOg1yl252KJU+Ipc="; + buildTypesAiobotocorePackage "ec2" "2.15.2" + "sha256-13MWHHnHn17FW8NLfIxyCRwjk09xBG4rKhOn27IFB4M="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.1" - "sha256-A5OdqOTax+3/v6GG3IzU771A4l3OXQhqlowknE0DnNU="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.2" + "sha256-k+nxNJHuQouSxGSG/nigyvlx7qz0KvWnApGSvLPgOjQ="; types-aiobotocore-ecr = - buildTypesAiobotocorePackage "ecr" "2.15.1" - "sha256-3b5SI5qHhvVIa8hqLp/YZu9b3DDpZm5ogRv0I0NuI0Y="; + buildTypesAiobotocorePackage "ecr" "2.15.2" + "sha256-MSh/z9Wzj6VUFz40U3QHe7ABj8d0HZqEidkG/lIDb6U="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.15.1" - "sha256-enLMc0Vg+RwO3SBzvDd/nKQvNbCllMJMS4BBKGUNWuQ="; + buildTypesAiobotocorePackage "ecr-public" "2.15.2" + "sha256-9jRWoSdETNAU8a4kTGj+4Gj+8CU3Y2m3RJSQ2Tlw4fg="; types-aiobotocore-ecs = - buildTypesAiobotocorePackage "ecs" "2.15.1" - "sha256-GOUkXglekGMNDlWdz9dyGvZpgSTfnZAh3e80CMvzumA="; + buildTypesAiobotocorePackage "ecs" "2.15.2" + "sha256-ZO4pKMnUf7g4DdKGvEuEzDM3hBEDe5yOSPPXhWDSLiU="; types-aiobotocore-efs = - buildTypesAiobotocorePackage "efs" "2.15.1" - "sha256-+KZQnRFKF+0nmOqec1jHa0ewAcfLBoW9mrMVNZn6q78="; + buildTypesAiobotocorePackage "efs" "2.15.2" + "sha256-BdXAO/Q7ymBnDbFccevpxTsNs5zcY5VZQtODBmbGEcI="; types-aiobotocore-eks = - buildTypesAiobotocorePackage "eks" "2.15.1" - "sha256-4d/rL6L/W2zfZ1naceSfH/E1y2DUNMcQ2tJaaKsRjLw="; + buildTypesAiobotocorePackage "eks" "2.15.2" + "sha256-qKOpyzUhdoKIB253zg/iLeByAYJVsKMZ0hytwY0kU8o="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.15.1" - "sha256-AOhrrWLtKq5Wr79TcFNa+A3/MhHMnAPMIPEgcum2/ZA="; + buildTypesAiobotocorePackage "elastic-inference" "2.15.2" + "sha256-gnZqnLwqGbup02Gaqo/JbAtSMlEl6Rlcm7+3MNQ7MTs="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.15.1" - "sha256-Psxy6JILUzvwmUj9QP2wTeIgt/nbtpbG3LUozN9ltek="; + buildTypesAiobotocorePackage "elasticache" "2.15.2" + "sha256-DpTquyKW0+uGZZLDnG6+N3k/aEBWaBCd6gx2RiQZ3fk="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.1" - "sha256-3Jt67THyNfn92g6L/GZwPi0HLb6bpLuoDAkuXKPZu1Y="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.2" + "sha256-DV7tOZxA63kA04q+0vUpoTP7QVJ9C3D3NodvcTJJfLg="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.15.1" - "sha256-mGNHO2T129nPrODffC8Y9+R+XKjVVUnFrw1yDkJ0g/A="; + buildTypesAiobotocorePackage "elastictranscoder" "2.15.2" + "sha256-eFBKfNePfk9+765pfX7HVfusysU6shBHA+RFrAXKI4Y="; types-aiobotocore-elb = - buildTypesAiobotocorePackage "elb" "2.15.1" - "sha256-wceBAH30EypOqb4GqTP6aL6Ribm4l6b082+vB4sRDMs="; + buildTypesAiobotocorePackage "elb" "2.15.2" + "sha256-yzE/hHLfuEO/XJF7PfRxdnxYORfFiJjWeO0RKYXKH1o="; types-aiobotocore-elbv2 = - buildTypesAiobotocorePackage "elbv2" "2.15.1" - "sha256-4si+dqz/nPdXAF+eUkTICZQ8JaT+DcxEbmrxKZcF5G0="; + buildTypesAiobotocorePackage "elbv2" "2.15.2" + "sha256-sG42uIpI2QoHgo+Uuik2cQnKoINQmFXyaSZ1bVilZtA="; types-aiobotocore-emr = - buildTypesAiobotocorePackage "emr" "2.15.1" - "sha256-4Ak5F+RnUlOnMvEhVTXrHXkQQzWSo7iRIojrwYifMnA="; + buildTypesAiobotocorePackage "emr" "2.15.2" + "sha256-0dBL/3beR2OKwCpxBjS5SnFx93QnHAc6c2LsvTQXI7Y="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.15.1" - "sha256-Q1ZGZfpub4fceqFyBTLxj5G27ByHYPRH8KvEMyFZWyQ="; + buildTypesAiobotocorePackage "emr-containers" "2.15.2" + "sha256-xNAW2n4skTQgHzrSgyfhYdPRFjvB/yYyo78rTKqoc6c="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.15.1" - "sha256-lHSPS5/HAW2NFg6zCKXARznJ1UjTWIn/YDR9XlMa1ag="; + buildTypesAiobotocorePackage "emr-serverless" "2.15.2" + "sha256-rlomQa/70HGPRCG4uf4UCAv5V/TbQ22yUNh9FsFrHGA="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.15.1" - "sha256-QXAAHqiq1ThUvS5Y59SXA0OKQza0IrxPUyGwpZ1Ft1U="; + buildTypesAiobotocorePackage "entityresolution" "2.15.2" + "sha256-NYKSykt5nfe5ML1b3vOBOUaHdFoEJVt+g29BRJbELhs="; types-aiobotocore-es = - buildTypesAiobotocorePackage "es" "2.15.1" - "sha256-lHKKWM984zvnbcO2ord+XkbFm91y2OAJlddm3dongo8="; + buildTypesAiobotocorePackage "es" "2.15.2" + "sha256-ACWSJlnd6IjQez53QIKmrV1dtqI13yuohsMw6LC+vzI="; types-aiobotocore-events = - buildTypesAiobotocorePackage "events" "2.15.1" - "sha256-3XQ9EjRu2qfpvHAWbM7XHodvMCR5PXOzM5ttes7ggEM="; + buildTypesAiobotocorePackage "events" "2.15.2" + "sha256-70GCA4DvVUz2e1oXNKrd+sDUO4FYRI2fA1Q9zg6Yw4Y="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.15.1" - "sha256-DR+GYAUdE7Nfn0X0sp3IshbfKjcrtFVCk3KObFlQbdM="; + buildTypesAiobotocorePackage "evidently" "2.15.2" + "sha256-5/+S+GXnUQOyu4u5NsirkbakGcq8mRzl8ss578BbMfs="; types-aiobotocore-finspace = - buildTypesAiobotocorePackage "finspace" "2.15.1" - "sha256-kIg535sFaySMannjaMHmVEZqx7Lh1OnGpBc/CxMqWzY="; + buildTypesAiobotocorePackage "finspace" "2.15.2" + "sha256-TygJjwA7xBxxEFZ0vcqn3+XsOBMJLpyGnWELj0V7Ifk="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.15.1" - "sha256-rGvEfMJt7mmrned4uLGaN58ZGgFJzNPwxFCRu3SghWg="; + buildTypesAiobotocorePackage "finspace-data" "2.15.2" + "sha256-rVleSTHqz08/5zBhzZQio733uy0rXRtFneqtjzQjHGs="; types-aiobotocore-firehose = - buildTypesAiobotocorePackage "firehose" "2.15.1" - "sha256-gkBhNs6Cpy7dL4o/SyOxwF7eCwlnHaGxbSjO0FvPxpM="; + buildTypesAiobotocorePackage "firehose" "2.15.2" + "sha256-+2rDM4qMi1AE4FZQ77Gir1VhONaq/H2NRfiwqhr4s38="; types-aiobotocore-fis = - buildTypesAiobotocorePackage "fis" "2.15.1" - "sha256-BKyTNVhRzYjQDXwhTpo9rblgEonzPubmJIOrCnwaEus="; + buildTypesAiobotocorePackage "fis" "2.15.2" + "sha256-C805H2eghE45jQFdabaYl9JGTjGzKdbpJOvPUT+9etE="; types-aiobotocore-fms = - buildTypesAiobotocorePackage "fms" "2.15.1" - "sha256-9v2x/BYM6tiPWPC/c7ZNJufl5EStBRq7dSW9S3jaWTc="; + buildTypesAiobotocorePackage "fms" "2.15.2" + "sha256-njmD/gMffz9BMGHaFtiLkBfQJs2qMk9fuibvbjEXdpQ="; types-aiobotocore-forecast = - buildTypesAiobotocorePackage "forecast" "2.15.1" - "sha256-7B24s2z0hwaXZzj/ryhfIqbiFPaiFuC8GOn5MaYsB0U="; + buildTypesAiobotocorePackage "forecast" "2.15.2" + "sha256-CzK4VMvhuGfSygAKpJOL4zBZuKSiFoHzFmu7DDXwWhs="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.15.1" - "sha256-Z/Ul3IhUDhYjijXU9fFCOsG2r927wvl3pOWP+SxZ7rE="; + buildTypesAiobotocorePackage "forecastquery" "2.15.2" + "sha256-wW/e5dWz9NaWGQUcx5E51lsxMp8frgFO0d1dFpr69PA="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.15.1" - "sha256-ZNnWPccp4nnNAUk6tsAfV6xYS0U98rh17bTXG9+NjBY="; + buildTypesAiobotocorePackage "frauddetector" "2.15.2" + "sha256-TL/Dvkfj1i+cvBuOiyGUwFLZp4AG1VpSfEPzBAkkS24="; types-aiobotocore-fsx = - buildTypesAiobotocorePackage "fsx" "2.15.1" - "sha256-72IyOCvtGPR2JNpIIy0rgiACfmDfxKlV/wo5AvzTdf4="; + buildTypesAiobotocorePackage "fsx" "2.15.2" + "sha256-smCufroBQ6UNbfOTfnr8sJbwRMLcr1d5XO3Fmsr8oF4="; types-aiobotocore-gamelift = - buildTypesAiobotocorePackage "gamelift" "2.15.1" - "sha256-jFgO3ks0u/1YMjeQXHvMYoa4O35+VrvpeXWIAeJRj2I="; + buildTypesAiobotocorePackage "gamelift" "2.15.2" + "sha256-yu7KH5q1KWa0XZpX4jwtWdYItOjyK2NU824c8RawGC0="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; types-aiobotocore-glacier = - buildTypesAiobotocorePackage "glacier" "2.15.1" - "sha256-5BewcGF6cDdPnTqyKLHlJIYuiv5N4GSuIlouRCEMeAQ="; + buildTypesAiobotocorePackage "glacier" "2.15.2" + "sha256-uvVtYnhswWmCCngRxzSucyWMD8IiUMv51TYH+KvePOo="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.15.1" - "sha256-fh2RP530haUdEOM7noDiBmiHf5Cv+YvF8S4Xoh84K20="; + buildTypesAiobotocorePackage "globalaccelerator" "2.15.2" + "sha256-EG+Mub4z9+e1FSOYM9TymEBLkptdBCORAzq5f+FgDb8="; types-aiobotocore-glue = - buildTypesAiobotocorePackage "glue" "2.15.1" - "sha256-z4fe7DbzI2AIkCa4qBS4kGyPcgti1d/CPJCqe82OuR4="; + buildTypesAiobotocorePackage "glue" "2.15.2" + "sha256-Yt9Bdj97pjBNjzAs4yfhPVXumdZBMR8K6fh9RMVE44U="; types-aiobotocore-grafana = - buildTypesAiobotocorePackage "grafana" "2.15.1" - "sha256-V6uqUzVntsISmOUH9Mjy5DjLxiYkPN9k6BtQFwer4wM="; + buildTypesAiobotocorePackage "grafana" "2.15.2" + "sha256-9SxJCAQTFvkyLLMUjZa8Sw8gmvA7CEmq8plCL2Im2vI="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.15.1" - "sha256-C/W6eBJauG9QI8MMc7hFzkN4A21RRMH6kSU5Wq/qXus="; + buildTypesAiobotocorePackage "greengrass" "2.15.2" + "sha256-o2zx53sUfII3M2riAnSof/W0zjP1aDUMnRmZmFPuQZg="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.15.1" - "sha256-00hMhRWJ4W91I6cG5IXyyNqjyxPFrwmbHp69EWIIkMg="; + buildTypesAiobotocorePackage "greengrassv2" "2.15.2" + "sha256-gFUVkGUva3v9BgvOiSZTJlLEmR8xJPdbtraUXc3uDvE="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.15.1" - "sha256-++YYod+5UlCzknDJ/0l3hwPNukO9o2M0CoZR0lyOTnA="; + buildTypesAiobotocorePackage "groundstation" "2.15.2" + "sha256-j8tHv3buQXMUNcu13zEqYEgh9y32qvZtGf7RwL/Ded0="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.15.1" - "sha256-+fJrH77TQKCBoio2R3LEJLmUOtSXd9oaf+PaN0YyEdA="; + buildTypesAiobotocorePackage "guardduty" "2.15.2" + "sha256-mvlSXeVh+aqX5nCBiDmLfVY3YzT8S3JGHqTmBECxijQ="; types-aiobotocore-health = - buildTypesAiobotocorePackage "health" "2.15.1" - "sha256-KNaHkgFc1W6cK7nwt7ZibmeL3zMmO2/6O1OlRkrUERY="; + buildTypesAiobotocorePackage "health" "2.15.2" + "sha256-5aQSWo0L9uonXTWh5tZzukj5Jka2iJQF7Pn55tOR4to="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.15.1" - "sha256-JtP47qVkcTMtafPT/YbEu/CFOh4yp1VLICTVzB2LeV4="; + buildTypesAiobotocorePackage "healthlake" "2.15.2" + "sha256-MbPcf35D3xDJsReScEoRsMEbNcxCNqP6awnZ3wzEnK4="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; types-aiobotocore-iam = - buildTypesAiobotocorePackage "iam" "2.15.1" - "sha256-CKNmGY362fvOEdm9+UvElI9U3dZhjY4sTDnuzBaPJyw="; + buildTypesAiobotocorePackage "iam" "2.15.2" + "sha256-gj0mnoKF4hCs6oWAil9XS6V/8YnmGVEu6dvh4l3Gl9o="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.15.1" - "sha256-LIEyxMseTo/G44R9gUeWFOoR/k1aZ1a6nLA8uuoti70="; + buildTypesAiobotocorePackage "identitystore" "2.15.2" + "sha256-OFIHUrjhNBztSEhictiFeLCcIITmihIIs337DT2z6IM="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.15.1" - "sha256-YromFw8hMXBV3v9rAfmAFg/1MWMSsBR8jCjgnN3Qjdc="; + buildTypesAiobotocorePackage "imagebuilder" "2.15.2" + "sha256-iVa8PY/Ymt8C8x0uWlLAvKcMWhxm/i0Fjy8+wq+vBAs="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.15.1" - "sha256-UvwCZclRwoDaAMhY6CdhCADFs0m258Z34FVTH95CrZ8="; + buildTypesAiobotocorePackage "importexport" "2.15.2" + "sha256-XODBb05MkRhTPkK44G1dF5PCObngkR0JIenShPg/SEM="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.15.1" - "sha256-5vgqzDYe/y3vHvKFuYfhArZfmLHRPDuhGaSBRHWUiis="; + buildTypesAiobotocorePackage "inspector" "2.15.2" + "sha256-W6cJuqZoOgrSHKWvYnLmNpyfswjJbB/pYfSyUYcN5Qg="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.15.1" - "sha256-2CPWpQt1jylh05MtxFIoig4DVoSBkHYVKEl0j/2s1v0="; + buildTypesAiobotocorePackage "inspector2" "2.15.2" + "sha256-toUQmdF8Tdakr6cIfAty6mIyHQ7lHyYheEbkrVDsD3g="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.15.1" - "sha256-aXAhRpaoJC0BR/KqG/0FF139mLFBTaqQdr0m5B8vz/k="; + buildTypesAiobotocorePackage "internetmonitor" "2.15.2" + "sha256-w8XaOTpY69HY4Y9HXHRzs/UNYVLEJ+OY4vL7K9CYZlU="; types-aiobotocore-iot = - buildTypesAiobotocorePackage "iot" "2.15.1" - "sha256-iVdmdRpw4/gj6Lsy6gP8C6HwvIKhKmKHpvR5HoB4jE8="; + buildTypesAiobotocorePackage "iot" "2.15.2" + "sha256-KV3EkKI3KoPCwK0lGDyCRF3QzKgdt3VP0mzm0S1Urko="; types-aiobotocore-iot-data = - buildTypesAiobotocorePackage "iot-data" "2.15.1" - "sha256-WVcWtkcrV0jTqCuygnDi6CZFVt/xuReFy6ji+BAjylQ="; + buildTypesAiobotocorePackage "iot-data" "2.15.2" + "sha256-j7Kffix+aoo6N0IKNtKuD1cmIxk/yeNXgQUvTwAOFNI="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.15.1" - "sha256-Ym5Pxg3N++/QRdLNzHAOZQmObdroyhgO6tPHLmGfCPY="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.15.2" + "sha256-rbNjx7Moa6xY8aQRNF54hurpbr/jLhDfR0IXZNKaZXg="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.15.1" - "sha256-OJmSfZaKAfiq7UImpgF/wKTzYaqxlhqrkOAbk7OchrM="; + buildTypesAiobotocorePackage "iot1click-devices" "2.15.2" + "sha256-OK7Yw0t1rSXQz2BJrP0zYorMjGGdac2SS9IpKNrF6y4="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.15.1" - "sha256-8Q6P8K87YIs+UsR5Vyyx9IMBW0fLAMqCu/LkqkUQYEU="; + buildTypesAiobotocorePackage "iot1click-projects" "2.15.2" + "sha256-kNEVudATczB+qs0XyihgJbmH/02Ds8tGuzKWQ5IDj4M="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.15.1" - "sha256-HkzZSHFbEWv67uQRIH6W/CsAFI1HpsFeNLvbqjQEJsQ="; + buildTypesAiobotocorePackage "iotanalytics" "2.15.2" + "sha256-scMpD4ZGJyTA97b70t80fE/mQkS5LwumJCWD2v7ul9w="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.1" - "sha256-SMNXQLSk9rFAXgEKXk23cjWRRvhnUcskkQyeSetngcE="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.2" + "sha256-XLS46QND2ZNbm0pB73gGrkJVS8ulEoBPAf2EucNQqNA="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.15.1" - "sha256-vRnjkeGogwcdtRFybEuqB4FjR89N0KR8pdDWs4caa8I="; + buildTypesAiobotocorePackage "iotevents" "2.15.2" + "sha256-b21od8f3xlkyMebl6QFNKqhGCO4FcioMWX8odrKolnk="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.15.1" - "sha256-j9yAFJUVBUtViPCO3DBCo1tC9AcLO2Uy4I2lfThBV+I="; + buildTypesAiobotocorePackage "iotevents-data" "2.15.2" + "sha256-laNqog/9QdCDOtNhmBwki2hfJur9M+M6rqdVVZZKRyk="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.15.1" - "sha256-k7D8o7sxTlyjmlCBmt2uY/FKC6KUWmx9LL9k2zedszU="; + buildTypesAiobotocorePackage "iotfleethub" "2.15.2" + "sha256-cXdG48rRVvZtvg0nnPcl6lDmyukhQpGH2tHyMhp6KpA="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.15.1" - "sha256-lozZuY4r9CkPi+SD9p/T35HyjiHVMmJ33GKNEZ/htPc="; + buildTypesAiobotocorePackage "iotfleetwise" "2.15.2" + "sha256-Qokco8UgSqsRZ03NawYHvyCx9qc+/q2mYPUEp+OhqOA="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.1" - "sha256-3Bw3N2aIUzKNLyMGnHsxQB8bofonIcqJANariAKqXsI="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.2" + "sha256-Iq6WU6a7bfb8+ob0feMoVbJr0J3tQI7L0nsV7X7E3rM="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.15.1" - "sha256-WZqYRDV21kkgBMb5z+6KKTlGxDJKXmMl1u3RlTPavl4="; + buildTypesAiobotocorePackage "iotsitewise" "2.15.2" + "sha256-9XjABgFHnbEIztv7CiS2QX/dUgawqic3XEJ5CSt0oEk="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.15.1" - "sha256-/ArOj+prhHoDPRymOW4NN8IXNkWuE/wZJuRAXMVmzpg="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.15.2" + "sha256-pbVgFQOcfnEjPRYsXz+XHEh9Xa0aAZvTD7coaYt2uR0="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.15.1" - "sha256-gE3/juMs0BFJZEq291UGWAh41NCRHWHmZY+KcZ9IFJE="; + buildTypesAiobotocorePackage "iottwinmaker" "2.15.2" + "sha256-hyyW7WVaxyvus78zPDvy9g8J1/ZY3r0RbjhcgApVx0E="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.15.1" - "sha256-PRORLAzdQ0QmYSPYWrQaPSwW8JaeTyzg8Z+N8/Hqjz8="; + buildTypesAiobotocorePackage "iotwireless" "2.15.2" + "sha256-+vc1U5s8yLnpBsrB1rzuwZj1z/ECe4NTUfIcuO5FRdk="; types-aiobotocore-ivs = - buildTypesAiobotocorePackage "ivs" "2.15.1" - "sha256-OIvBSFt9S+SmZIjdw/zcC/FC/3d9Huce5jQXgj5D+ik="; + buildTypesAiobotocorePackage "ivs" "2.15.2" + "sha256-lkDOjzhDWTFECa+hxb8EIVpxd+j9FSHGb9L9fRePNRo="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.15.1" - "sha256-Eh5fuYJawPwAFuQl0/wLq+gTJ02C5wFZsETDsOSi3LU="; + buildTypesAiobotocorePackage "ivs-realtime" "2.15.2" + "sha256-hFFPTJHySEHbcNwgg6YnU8GJBDA8y2F1pyAY2jpw8CE="; types-aiobotocore-ivschat = - buildTypesAiobotocorePackage "ivschat" "2.15.1" - "sha256-jk6zZ3zX94kIfld9oXd6zW7ILhaa01XOt7c+/5pn8kk="; + buildTypesAiobotocorePackage "ivschat" "2.15.2" + "sha256-/nKK+JmeOr6zG8OEeNvBT1cWUTD55gK/LCFze3/P4p8="; types-aiobotocore-kafka = - buildTypesAiobotocorePackage "kafka" "2.15.1" - "sha256-NJv1QF3qBn5LJ7yhKcSmy6W3OJ8kenfzQ4RkSRx8iTo="; + buildTypesAiobotocorePackage "kafka" "2.15.2" + "sha256-H+1xCc+/5RZ684yMxhzqUTysj9QvUMMVMcd+kI9PGZQ="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.15.1" - "sha256-7EDrF3TxDgLeAnbUeLQj7SpFPLB+uMjqc/sQxWaXYlU="; + buildTypesAiobotocorePackage "kafkaconnect" "2.15.2" + "sha256-JH+0rJQmzsJ/LBWMSp/UsjtFpD6FmMtkfr0+9tJKKoY="; types-aiobotocore-kendra = - buildTypesAiobotocorePackage "kendra" "2.15.1" - "sha256-8k/FEmIfl2dKDt4JrCWdrLskYuj+A2VEHm0jqHWfUp8="; + buildTypesAiobotocorePackage "kendra" "2.15.2" + "sha256-+gQGQmC8lgxAF0Pyo7mloBLN/iSfqvM67KyntXFU4wg="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.15.1" - "sha256-ZaDBuYlm35DRaiKv+xV2L+e/E5x1rGN59UTL2U5bRp8="; + buildTypesAiobotocorePackage "kendra-ranking" "2.15.2" + "sha256-Qg/EN+M3YqqnYkYBFm34YoDnxfEFbmA7YUId/+YmEME="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.15.1" - "sha256-UgzrxIq3vh8dfw80VCue7gf8l19TqRUmRuAS/cW/G1M="; + buildTypesAiobotocorePackage "keyspaces" "2.15.2" + "sha256-QjwiOj8YhfmCjmM+7C4WP5kPtQcpLb7TbXam/+XMH0U="; types-aiobotocore-kinesis = - buildTypesAiobotocorePackage "kinesis" "2.15.1" - "sha256-MF7n5Z70BFUAXaFuTDWIzFuiZ3u1fpYoZrBfRQR97Qw="; + buildTypesAiobotocorePackage "kinesis" "2.15.2" + "sha256-1kwvF+RK4CjpEyv/BAi7u6R4kdL2y6PiWrp4pWt38yw="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.1" - "sha256-bEZV3TDr3l6Ogn49kFW/3IcFi/4NjQQnaC1LrDChlcI="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.2" + "sha256-vudWpiyA9u3f5v191Ajh/K5EvZJLeaKxqjo5oPjRbuk="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.15.1" - "sha256-PPT89cO2FukHtnXQHgcNZie3vPCDBmbrfRDiZCZaJ1E="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.15.2" + "sha256-t2FvtZiKBLfD/RADQ3+6ZzfUXUnq/PYMAMHj1YQmobU="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.1" - "sha256-Fez2At/MFggTu7ZtfKLWCm7iELH6gumBhn3t7KdJzVA="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.2" + "sha256-ImrtDqLs6k8nQBtXa0gEH34kFlBorZSrX1hCRqV130o="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.1" - "sha256-5h9x9Rgb1Sb8wIQwRcjkonc2070QahwPkKXfQ/lFFI8="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.2" + "sha256-Jb1oWeQgXmLP7fFSWG5ZgNLzUaZRITNGhVWWMlfQLQc="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.15.1" - "sha256-JEye+bOxLrRJDToMs5jQZ2wcHy1K/2C5oPFUIRrtO5g="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.15.2" + "sha256-LXVmEz3iHWl3Svg5F3X06CJvStcQdwOlSS8m+uQj+Hk="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.1" - "sha256-j2gcnHFfWTVD3NatfJXsp3hRVEsy4930OclgR5IPbDM="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.2" + "sha256-RCz0ySwc+gWzyVDKTFT2pXkqy9PEmg6uF8BOoLHzvmA="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.15.1" - "sha256-mnKzF2lgYtHTNEwecoqs4qt9hQ5m2xLo79/kZHFyF5I="; + buildTypesAiobotocorePackage "kinesisvideo" "2.15.2" + "sha256-m1movOOFQVLCzKSCWSoYv03Ig9D0qJ17O73tk4XaTX0="; types-aiobotocore-kms = - buildTypesAiobotocorePackage "kms" "2.15.1" - "sha256-CCyhwWkjtI7wp5CN1MCK0M//bOu4ZGttbHJSUcidjUA="; + buildTypesAiobotocorePackage "kms" "2.15.2" + "sha256-9EXCtfSVjSuyszl3H8Llk5j/KYmU9HSUFP/k1Btrlv4="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.15.1" - "sha256-+BlDjTPv+fmKmUInm6FpOQFt5H5atz7BWKhrt56A3Co="; + buildTypesAiobotocorePackage "lakeformation" "2.15.2" + "sha256-zYavyl1U94TCsmjyVhedtexjl0B+2FN3jo6Dg2adePo="; types-aiobotocore-lambda = - buildTypesAiobotocorePackage "lambda" "2.15.1" - "sha256-hCTL2KBMt5p51YwnOYNcpGvzG2wvZjt23kK3FX4Qp5U="; + buildTypesAiobotocorePackage "lambda" "2.15.2" + "sha256-vRsrDk4dzT7wsCeaNE2dnf8blwM/Unb3lAN8Dc0x7SA="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.15.1" - "sha256-A8BAADavGEB7sa+fh9SRahoqN3mne7ABZjcnZI9YfBk="; + buildTypesAiobotocorePackage "lex-models" "2.15.2" + "sha256-jSO3wtWRgXuPCHFfFgBDw0lMsOYb1IjqzCmo1WX6Gr4="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.15.1" - "sha256-QVYHr4fbnZPozVghHOZVsyChTuP2S0Ys+876slONaEc="; + buildTypesAiobotocorePackage "lex-runtime" "2.15.2" + "sha256-BdaqbSjKpsFeDTh7ttj1j48YDSMP651UpgmqmM82KpI="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.15.1" - "sha256-uqZrNG/mOCnfYjNF5FQofjSUeXhnidunT1754yame7E="; + buildTypesAiobotocorePackage "lexv2-models" "2.15.2" + "sha256-sJZcOkCK9x7RsFo6mVR7FGmictWprwVUlPpzuMbQEn4="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.15.1" - "sha256-hQGTDbhJNiJc5dORzg7XJ4p+ZatNcI0qoT70qtMHzHc="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.15.2" + "sha256-dmn/Q2ljn4+AIryiIcytMGxAS92Q0vZdv2yuuA3/0vo="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.15.1" - "sha256-4whyQ2X/R2eMdQ7DOygNQFqMgLA+w+6ydyN8s7yxgB4="; + buildTypesAiobotocorePackage "license-manager" "2.15.2" + "sha256-HfsmPqnNEoBM/Q6d5GbhV1qykXlO2KE9DURQi7cEnBo="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.1" - "sha256-uD/N/ueijWNwibOrivY0r2HiQjYOuHQUONcW3iRCVUY="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.2" + "sha256-u4pZBE0deFVSfZ4B5LXXXOBDb/SkpnCTi1pHQ7ZVyb0="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.1" - "sha256-wWghsiPCvWY7VX5XV0ad65nnG9bI5F+E5xEUzOGDdnY="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.2" + "sha256-Ldd8K7DIjE0cNqvdWWVno2ehVzmtdt9IyLdUKuM1k5k="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.15.1" - "sha256-dcGUPUxGvD/ZEyoo193VVOhSJhoFkgwSjpOV1kX/vMM="; + buildTypesAiobotocorePackage "lightsail" "2.15.2" + "sha256-Odx5WGYh8Xlv6ahMuNjj3XzXftrKQdILAoGMoDz9aBQ="; types-aiobotocore-location = - buildTypesAiobotocorePackage "location" "2.15.1" - "sha256-4rTqmcRB3HjskWJZLbQaPDyNQGHXmVVJqb5LK+EPH6Y="; + buildTypesAiobotocorePackage "location" "2.15.2" + "sha256-KjQ02j1x55qp+6RA1pWe4z53rUgd0Z59dp4vjHVSwlY="; types-aiobotocore-logs = - buildTypesAiobotocorePackage "logs" "2.15.1" - "sha256-CRluCc0/byuRlGr3uQyWg/MfCpPnoiS5inNLiYkhwCY="; + buildTypesAiobotocorePackage "logs" "2.15.2" + "sha256-4cxlv7ZSVy92Ewm5jgjqAXRKjFOczaYhl74zR+wGltU="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.15.1" - "sha256-q5ExCn4HAdAGISDIRckrnlmQ+J1RDNgBa5hmYSJHtVc="; + buildTypesAiobotocorePackage "lookoutequipment" "2.15.2" + "sha256-gEmhfU9rLE2hFRumda25SSBqhgOgZFza0lPiN+z6sGs="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.15.1" - "sha256-SvJor9naL/MzyTtHjOn2QMNnLYXnmHYH11DuWg0+y/U="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.15.2" + "sha256-VN3E+UkX8wvQqY3J5SSIfCcpDM/wfuqMvX6KbMUfFkU="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.15.1" - "sha256-68PGFV+fSjjwAq4SoiOAaJXw1jKdQegFgz2UeHV9iL8="; + buildTypesAiobotocorePackage "lookoutvision" "2.15.2" + "sha256-6Tpk8lEKtYjIiXNI1VgH65RkCc6/Cp9qhB/5NHtl0ok="; types-aiobotocore-m2 = - buildTypesAiobotocorePackage "m2" "2.15.1" - "sha256-TrP432QWYmAmnka3CiWklZh3g/xrLhGJVw8iWLR5f8E="; + buildTypesAiobotocorePackage "m2" "2.15.2" + "sha256-ZK+mMbIaY2BmeZU0P4GTMcbTcUOJ1k0ErkRTDu/LdeQ="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.15.1" - "sha256-0+nIbuZeuKIhQiC2+kSaDztMLOUe9rZ+guDROGM+YI4="; + buildTypesAiobotocorePackage "machinelearning" "2.15.2" + "sha256-CkcJc43D+K24tN+MO48iIpkWINQ5v39Us6XiAerY5ug="; types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; types-aiobotocore-macie2 = - buildTypesAiobotocorePackage "macie2" "2.15.1" - "sha256-lJq53Sxg+RpZSeQKG+nu0EhRQEEUSPoWqiORJUcoqEI="; + buildTypesAiobotocorePackage "macie2" "2.15.2" + "sha256-XVUlAYWbCKlIHDD0KnAf1x5aIzPQOwDF/MUf2Cn0w2E="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.15.1" - "sha256-RZUktF80I0PXhIPEZJav1i1a4FyFSyHODTeUsIcDHGE="; + buildTypesAiobotocorePackage "managedblockchain" "2.15.2" + "sha256-bS54O33UB62+P6Lz+u4zzBDMP/dGG0EQYzJwabrLEzE="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.15.1" - "sha256-xmPCGjlO0EThkhUWy+VlHLplAx7f7+zXKzr5hb/1e6A="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.15.2" + "sha256-tI0WjxdRupLqL437/Q9W7Yd6PEzU2GBsfAGU/3UssG8="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.15.1" - "sha256-OJeNrERgHfCYfgpn+DMmo7ZgUujg5G3bQpedipAxbX4="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.15.2" + "sha256-L23ZQ4bGhQtHat3xWT/IIbrTr4UnZ1wY2Cco9Z4ae4s="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.1" - "sha256-0tSQ1wnz7R7KaRVsoNGeUcbmf4cRBrUMArCEEDJRrtc="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.2" + "sha256-7SXKNz2Lz2aewLAcKVvuIZShdGCRHZbwyKy2araKo3A="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.1" - "sha256-gq//bvGswyJgLHypO0vC0rUruMvr5DH0TQPgxb6Xkrc="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.2" + "sha256-qbAaQevFItdsIk7Je5ng9EMrTgVRfMmSmCeYSH7BXMY="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.15.1" - "sha256-E0hjBGm+mIW0wG8kdLAhXc4BzMzJK4gESiyS2xVIEpU="; + buildTypesAiobotocorePackage "mediaconnect" "2.15.2" + "sha256-DwyW/Lz2TcJUpS21SZAJCZR9nySSFN7/k4Hwea51QDo="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.15.1" - "sha256-bHWlDRHqZ6vYcsM01peSdcQ5oqvSGiG/UHWlOinT1QQ="; + buildTypesAiobotocorePackage "mediaconvert" "2.15.2" + "sha256-xEi7pQSuq7vkcGrZx7/LSHDiGc0yRy5yDLB+R1Sw9i4="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.15.1" - "sha256-PrQPNUQI065kb8+ihArJOroydrAbOhFdS2yzq55nTKw="; + buildTypesAiobotocorePackage "medialive" "2.15.2" + "sha256-XejVpsX2j0u2TTB7y/ZkwCeBhKLQOpCuJm0BL88ocAg="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.15.1" - "sha256-2/pUMsZsuW44TpNCdtciCJ9z+Z7aREyBMBIFdV80lgU="; + buildTypesAiobotocorePackage "mediapackage" "2.15.2" + "sha256-SxNd+WdyHA0ijqV3urXldQXeMew19EUydNArzMdHSZk="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.15.1" - "sha256-QIaQ06qrpPa4nb7PgOyhbYH1Oz1KL1dwwy6/D60tgKk="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.15.2" + "sha256-OaJv/gY2yhR6rMstJx88NQY/IBO9NxqleUY4gfq5dd0="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.15.1" - "sha256-+YxeyUt3GqsliHI/T8ZMxfweAhnAXWHLxBZSNbmPVDg="; + buildTypesAiobotocorePackage "mediapackagev2" "2.15.2" + "sha256-8mQbc9Wp8PvcyHocdcR9VS1jyJYGnwCuB4qk1iGq4DA="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.15.1" - "sha256-09o+YQysUdNGoNT+IXaPIOCSHUxYFXezjxTvqPPWBNo="; + buildTypesAiobotocorePackage "mediastore" "2.15.2" + "sha256-HvMe5b/WoUL6osOakD4z3fGfC5dPWphZFXijpqVL4tk="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.15.1" - "sha256-yDovPCnikCe4qHPCyZPZEu7UlIHLW59EySO3xValmgw="; + buildTypesAiobotocorePackage "mediastore-data" "2.15.2" + "sha256-FqbPAwpzikmawdrNa1/R0SGj0G4WqGRxBT6xceJHX1A="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.15.1" - "sha256-BnrpdnphOkjk9D3MuhMEEBFL08NZE140o4+VR1Rp4O4="; + buildTypesAiobotocorePackage "mediatailor" "2.15.2" + "sha256-iHjBmnvn2Rzo62Ep1bjJoZKNVGArtwxdOZoT1+SneqE="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.15.1" - "sha256-6ona+KE489SPJSlokzwpiqERuBgWjqIYofh1rUmeKwo="; + buildTypesAiobotocorePackage "medical-imaging" "2.15.2" + "sha256-UXzTpoFnuJQRwJfahcWSfYO9lWuEP9W+CZWiGdiupPQ="; types-aiobotocore-memorydb = - buildTypesAiobotocorePackage "memorydb" "2.15.1" - "sha256-lYBb737JcKQa5cKm94O1C/psjuRNFFNftn3dctUeOnQ="; + buildTypesAiobotocorePackage "memorydb" "2.15.2" + "sha256-lFetqAmP6lwKTmJEhS1wcydBgePh4/hhkq/ngHAqxHw="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.15.1" - "sha256-9Z5s03sTVEzzXO43CTuf+YICuXisAZ/OGFyH44KOuF8="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.15.2" + "sha256-wT3cz2FprMmyhag/0ZODuHFiB+qKD6LKvehs8PWP8m4="; types-aiobotocore-mgh = - buildTypesAiobotocorePackage "mgh" "2.15.1" - "sha256-Oqi4SM+L1FQLs0jfyWXILG/XHs5X5K+5jvGcIr76OeY="; + buildTypesAiobotocorePackage "mgh" "2.15.2" + "sha256-uxukwGScWYD2oCXu8vPu6o2BJiLtnMuIXIgqXFF5VGA="; types-aiobotocore-mgn = - buildTypesAiobotocorePackage "mgn" "2.15.1" - "sha256-RqvU6K50yGzVQBSzS90htrFOScpondnyceN3ISshYlI="; + buildTypesAiobotocorePackage "mgn" "2.15.2" + "sha256-lXlNAFEQbteRMGiOfSpBF1AF12UYjc64sXaOVN6KZRg="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.1" - "sha256-j4LVmlaI8tuJxjkweiZRWgnYlR5p/M2u8JSkMg3Yufs="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.2" + "sha256-Ndj1DdPIam1NG5zAzKJkilE0TDHGykywc2hpxvWNyPY="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.15.1" - "sha256-yQDw0I8jlsVpL8MSerOV66yRdCE5ik7R/v+rkBAzKrk="; + buildTypesAiobotocorePackage "migrationhub-config" "2.15.2" + "sha256-LXu7VQkVpgqIMD7ucMV4Kj/Zv6FoFDvLX8rYjtO2ijg="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.1" - "sha256-2XxADXGruMbzM50bElDkwlKQZ/r+6HPhMOjj8InGOlM="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.2" + "sha256-Te1jZDw3UjMBM6DlCj38Nn42xRt86WzHGaJnjbobDMs="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.1" - "sha256-+VYnuMVf16mrgMJ5DMqdy6CPLGavuA0gUW1kv9Uu9rs="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.2" + "sha256-IkE/I9X6FXqNBsMUM2/lQ2SVIIaY8PtAyx0d4XA94BE="; types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.2" "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc="; types-aiobotocore-mq = - buildTypesAiobotocorePackage "mq" "2.15.1" - "sha256-2WEJoWXSfDmFl9liWtIaviLnAHgRA5dAamQx1YfXgzE="; + buildTypesAiobotocorePackage "mq" "2.15.2" + "sha256-VY6tLjwGYbJte8xoit/gIVuMSGkygYhpGrCVwmkcD+c="; types-aiobotocore-mturk = - buildTypesAiobotocorePackage "mturk" "2.15.1" - "sha256-TK9wWp3GEHhn4jypBdQEeJZp31IvKFFTuSLKxqxZoNU="; + buildTypesAiobotocorePackage "mturk" "2.15.2" + "sha256-wmnepAFZGXOk6+/G0XToAQBxPyrtmyGIl9DYcaQIwrI="; types-aiobotocore-mwaa = - buildTypesAiobotocorePackage "mwaa" "2.15.1" - "sha256-E1sWcLfHIlFelP3vb0yfhRpcyboyIutPrF3ByCNJITQ="; + buildTypesAiobotocorePackage "mwaa" "2.15.2" + "sha256-sjXYuZf6yffeiu4A/FYXebGTFr408e7QKNmML2y2yTA="; types-aiobotocore-neptune = - buildTypesAiobotocorePackage "neptune" "2.15.1" - "sha256-EtmxI6j5SlZZcv+YYsDki6VcMdRhZWEoJVT5VDFV/0g="; + buildTypesAiobotocorePackage "neptune" "2.15.2" + "sha256-hpnEfol8cLYk8AuIaBRitNIJoEMv1jvWzNED1b4xqfA="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.15.1" - "sha256-xiDYqvt2e7MiAe8nCQR51q5Ov8B94eYJhQgN+lvFDuA="; + buildTypesAiobotocorePackage "network-firewall" "2.15.2" + "sha256-rMaMUBlbxJKeRIX/eEKtYrO0mXiDdWyZ0x4GfoDw2iY="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.15.1" - "sha256-0SFOWAIckxRoWupRztC50CkOKqtUuxdNnM44SnPLYwQ="; + buildTypesAiobotocorePackage "networkmanager" "2.15.2" + "sha256-JbN4suHNPpgGnkz4HnEmZXF4HMVnzMDd9DO6/xnzOgo="; types-aiobotocore-nimble = - buildTypesAiobotocorePackage "nimble" "2.15.1" - "sha256-Hz6tsIdCcx5vzwD0PDmPKSpjqYEYENAiZz7WuZC9Ago="; + buildTypesAiobotocorePackage "nimble" "2.15.2" + "sha256-PChX5Jbgr0d1YaTZU9AbX3cM7NrhkyunK6/X3l+I8Q0="; types-aiobotocore-oam = - buildTypesAiobotocorePackage "oam" "2.15.1" - "sha256-abqiY/pGLnV7UzoojcX5aaUtKC//y5UFYG8XoS9hJgM="; + buildTypesAiobotocorePackage "oam" "2.15.2" + "sha256-VYimOD1qzkRxpieACK1D5Flm1jTMLEkbiRhOczOPiCw="; types-aiobotocore-omics = - buildTypesAiobotocorePackage "omics" "2.15.1" - "sha256-5k0LPHH0qUlEEAV6ASredhR65Phs0133c37N+YB+tcY="; + buildTypesAiobotocorePackage "omics" "2.15.2" + "sha256-NjwwQvLdS4yaH+0lWiO3WdCbYkEm7Xy+WDZ0fZv0iO4="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.15.1" - "sha256-4VqaoYwKkNckmb4BZDbWPLeEVa7tCxBD8g6pGQrr0Ng="; + buildTypesAiobotocorePackage "opensearch" "2.15.2" + "sha256-P/5KsryA4IRZ2B8Jvyb4UyhBwIrxAdR1Z1C0KfPgurQ="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.15.1" - "sha256-80E81Kv3FzkgGQvpVHxmYqnNIRtureOvIDmKdnUo7z4="; + buildTypesAiobotocorePackage "opensearchserverless" "2.15.2" + "sha256-kshUKyoAIgVyIMntWuCrAD+WZ9usxXH1k78y/DqTWvc="; types-aiobotocore-opsworks = - buildTypesAiobotocorePackage "opsworks" "2.15.1" - "sha256-bAAgU0b33CNXVK0Q9ynyPGbL5KBiQq6sT/mL1pWJpD0="; + buildTypesAiobotocorePackage "opsworks" "2.15.2" + "sha256-KJfyFi4FHoqicPmLnsknrR0Bs2rXiM5fNneR2i9SG6E="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.15.1" - "sha256-nVywDMlzkITUEW7K6FWoYz953wAqCiUemT0tu48yO6M="; + buildTypesAiobotocorePackage "opsworkscm" "2.15.2" + "sha256-T+JObJ+jB48uaS39I68YyDxggoWiMj/8Di1PzDCQChU="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.15.1" - "sha256-N7VzNLh+LCFrfdgmO982cau3B/d5uGoGO43vMMpTNBs="; + buildTypesAiobotocorePackage "organizations" "2.15.2" + "sha256-6TYjbdnUOCc29kWZ3RsdscEK40uS0q5fcwhVAZ46yKQ="; types-aiobotocore-osis = - buildTypesAiobotocorePackage "osis" "2.15.1" - "sha256-NpjX3LpbF1CajlqY9ow4GqCVjlrTBVT1U/Gn3wHSQTE="; + buildTypesAiobotocorePackage "osis" "2.15.2" + "sha256-zRFrveWqmZ67/Cb8vnmgUCwVgt9oUn9qS8YegKqKwCw="; types-aiobotocore-outposts = - buildTypesAiobotocorePackage "outposts" "2.15.1" - "sha256-lFRMsg9LhjizD8NsSyK209h+xtvYgTmJf5lc3OQyqdY="; + buildTypesAiobotocorePackage "outposts" "2.15.2" + "sha256-+Pa7Gy+7aend87amJsaob24WXQWdrpA+Tj17dnrEFaQ="; types-aiobotocore-panorama = - buildTypesAiobotocorePackage "panorama" "2.15.1" - "sha256-mdhrS+4Cg2VgH5AWroB2i5Pe6LEFfn9J9rEe+UQovxQ="; + buildTypesAiobotocorePackage "panorama" "2.15.2" + "sha256-7BW09/NkN4AFwR8qhvTs8nYSflG9cozyPFIpS8/Y6FQ="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.15.1" - "sha256-Lddnm936PSivXBygA44rgyd5wyPoPDns5XIYbQfQ91g="; + buildTypesAiobotocorePackage "payment-cryptography" "2.15.2" + "sha256-4tNGI26K1ejnLwfsCOU0Iy8JiQyjMmDsn6JP9RMG5MI="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.1" - "sha256-jTgsyYOLrTYNEfyhotGbbTrlQkTKqmd/0uKOMvmm06U="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.2" + "sha256-ZXVhYvin2ZjjusSXkg3byqW5QHtFEyd1uufi9nWvutM="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.15.1" - "sha256-RULc20Hv5VUT+MO1/hj+LlsdL88c1KuChWjzYY150Xs="; + buildTypesAiobotocorePackage "personalize" "2.15.2" + "sha256-3CPcx8rP6N59eoooZej/qcySZYIiRl7j8B96KB9CD7s="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.15.1" - "sha256-3gl7NVGwfh1jy8VewE76+Pe/cPKQitdnC3JAau1S9dE="; + buildTypesAiobotocorePackage "personalize-events" "2.15.2" + "sha256-jW4ZIOw2dPuebRyaQzl/aV5X5g3d+HyR96nK15KabKA="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.15.1" - "sha256-XnuLw62YOZN+EwJ6b1ZQCOwhIqzE8ntkrgmuqTY62vw="; + buildTypesAiobotocorePackage "personalize-runtime" "2.15.2" + "sha256-hQiddMrXRgWmQjIiytIIk3S3hYAyiSyM5wfGQ/PQtuo="; types-aiobotocore-pi = - buildTypesAiobotocorePackage "pi" "2.15.1" - "sha256-g8pzgnV5puJSLogXJrQn1zhYiOB7446R4xkxOQCwqSY="; + buildTypesAiobotocorePackage "pi" "2.15.2" + "sha256-S+Zf7VW+F1x4gnWVYJyTyvA/31mfBlHvVtDiSokuCEo="; types-aiobotocore-pinpoint = - buildTypesAiobotocorePackage "pinpoint" "2.15.1" - "sha256-gZJM4c3tSilImlxeKWU3szTmpnXxpS6kAvF/zKXglFQ="; + buildTypesAiobotocorePackage "pinpoint" "2.15.2" + "sha256-ajqWceNuGO3+ABzNi5rFook4tdWo7diCkfYIaNnCnqI="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.15.1" - "sha256-eXcDiAQjLAObgX3gfGtlVL6BNK8fq81f70tPNNcKJJ8="; + buildTypesAiobotocorePackage "pinpoint-email" "2.15.2" + "sha256-pMgodwm9Ihz99d/C+hP5Z5ZxSA9WQ5sOJu407j6w+9s="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.1" - "sha256-OPJiALIiUDioRjXkeLtksPBMlmsUpIRsZtuoTESnKpU="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.2" + "sha256-8E6frTBvs14nYtfhaWi+/5HTDhNGWcHMAktQ+DhARdY="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.1" - "sha256-SN3dXMpqcuJcWnpeUi4Jwtat9erU0KdSjfEbyf8pHXc="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.2" + "sha256-WWwFEhAEls6dVX9WNZrWywV4egtd1bt5n3pOCEb1p00="; types-aiobotocore-pipes = - buildTypesAiobotocorePackage "pipes" "2.15.1" - "sha256-Ru3j6tm6I+wtpKzkxBSFCfAleI52WnOSqgvlCIla9fE="; + buildTypesAiobotocorePackage "pipes" "2.15.2" + "sha256-5QD0FgHLNbU9BnppJtB7RKMg9cdOz0ILkF/gkR7igs4="; types-aiobotocore-polly = - buildTypesAiobotocorePackage "polly" "2.15.1" - "sha256-U9FwTzLVdE0UbAMTjMjrIMlRVlkuQRzKiIEd7ZepOWA="; + buildTypesAiobotocorePackage "polly" "2.15.2" + "sha256-r6onIkXMgieQ9xtjuaGsQqq52OOq6k/DUz3jO5uYi6U="; types-aiobotocore-pricing = - buildTypesAiobotocorePackage "pricing" "2.15.1" - "sha256-FEzR+YjEGFKWbihsat2gaDp87fdIPDCmeRv79U08fFo="; + buildTypesAiobotocorePackage "pricing" "2.15.2" + "sha256-5IvT+CsBX3WBfz0f2CVGAtal+SprCAqO7CGKOwSLpLQ="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.15.1" - "sha256-7OB4PIbZDsnXqLp+9cXd5ER5QIkUpjtJk+A+jT0286Y="; + buildTypesAiobotocorePackage "privatenetworks" "2.15.2" + "sha256-gfnx+RgpiZCtLmIPWuc3Lz5JM+IgxMsAKvOqxiwJmew="; types-aiobotocore-proton = - buildTypesAiobotocorePackage "proton" "2.15.1" - "sha256-MBUaIQIThP+JZHbVAU5r0yCHQs13wLAU87y1gRECFHU="; + buildTypesAiobotocorePackage "proton" "2.15.2" + "sha256-MGL3z4ULEon/EjSCLuN2sB6tAepic+ZG+vVAani6qpQ="; types-aiobotocore-qldb = - buildTypesAiobotocorePackage "qldb" "2.15.1" - "sha256-yES1WELzrI3Xz0F4S7y3NajtNTQO10S3hi+pQsZ4KVE="; + buildTypesAiobotocorePackage "qldb" "2.15.2" + "sha256-dX2wLRIg977khlZoVYd9y1UzRMLDorIBHvOhXX2r+KI="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.15.1" - "sha256-ISAoyu08TEXIr2VONRLIvRDaAOazDPEtPp66/CnmHv8="; + buildTypesAiobotocorePackage "qldb-session" "2.15.2" + "sha256-omOG7aWjTBdIHElYE14X7DyQKBNGY5yfOg4IeiL0ooo="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.15.1" - "sha256-eruqWUL7Yje7OJlV1arhKInqnXChEmI49nq75j4ZOrg="; + buildTypesAiobotocorePackage "quicksight" "2.15.2" + "sha256-U+151xlZAGz+JgIJD/mU9C1z85UCimqOubaX3x/0nhg="; types-aiobotocore-ram = - buildTypesAiobotocorePackage "ram" "2.15.1" - "sha256-/7+C/b51gkVW8QXyXg/5b1vzvTtZXS5ts9K6PWXAZU4="; + buildTypesAiobotocorePackage "ram" "2.15.2" + "sha256-lp2oA2JBXSgniu5MJR6F+HeSczlc+w4wj7zyPggA6dY="; types-aiobotocore-rbin = - buildTypesAiobotocorePackage "rbin" "2.15.1" - "sha256-/joJicKfFNQhy24zZp6vM/EmGZGBTwPTQ8w8KHv6CF0="; + buildTypesAiobotocorePackage "rbin" "2.15.2" + "sha256-sFrrTWJkFCMkF4gxH3nQvctzMag234P3gN0tKyvvZrE="; types-aiobotocore-rds = - buildTypesAiobotocorePackage "rds" "2.15.1" - "sha256-btYigxx5bnWll5u0IHDVpciY4ZV9dOxPDKReEv1i0AM="; + buildTypesAiobotocorePackage "rds" "2.15.2" + "sha256-lz03bzDbmAvjc0s5hKeuOohycOcj1wAZsePeWYGp5ts="; types-aiobotocore-rds-data = - buildTypesAiobotocorePackage "rds-data" "2.15.1" - "sha256-Kn4uM9F1UkiWGshjX62WD5qROnnTw6TgG4bPv9EWz4A="; + buildTypesAiobotocorePackage "rds-data" "2.15.2" + "sha256-WTb2V9H5MmEtDsboJmQPoRLRNWCL1Ot+myoRRBpDphw="; types-aiobotocore-redshift = - buildTypesAiobotocorePackage "redshift" "2.15.1" - "sha256-cOu5LEVvs1VdXyfgtM7PYzIUsNN1l//gHTiY0ArmFf0="; + buildTypesAiobotocorePackage "redshift" "2.15.2" + "sha256-ErKPn+GGiujvvRps8FIY+QRo0ycQQ4t8tYE64iwqrw8="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.15.1" - "sha256-9A4p2lohJEhOcL868mMJcmmjYSS8Gd/5ShbkvTunDQs="; + buildTypesAiobotocorePackage "redshift-data" "2.15.2" + "sha256-bxQv1ESSEBG3elReQbKurlEv3jMrfdztBbn7kIwrlJk="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.15.1" - "sha256-s+maghPzS18nSG+ozOp/hKQJRHZHwPhsASqUXaOs6Pk="; + buildTypesAiobotocorePackage "redshift-serverless" "2.15.2" + "sha256-EyciPvrLkG0maSoyVFRkV1gA30vPF+MybM0j4gtwjwA="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.15.1" - "sha256-aLCYGd8+LIgHxsR8Qr+rrruL5JERkn1etCL3o/A8sZw="; + buildTypesAiobotocorePackage "rekognition" "2.15.2" + "sha256-dqoAVV2zwCwgfIBb72gLSXminPq4FgPYYzZlzxumkrY="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.15.1" - "sha256-e8WN5g/vbWaYSNMZS43GOkdx6AFL15cPUvZn0Ufsvqk="; + buildTypesAiobotocorePackage "resiliencehub" "2.15.2" + "sha256-o8TBetwKqzHJj7ISkhgX9iPpt8CvZ5M3LFYmfEqmCDI="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.15.1" - "sha256-/WiO9zp/YK8+2p97cbY5GwQcb1XB5i86QBlXERTDxk8="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.15.2" + "sha256-hQ+Jc8m4q7Q7zHSJyCL62ugAMNeFLbEA8LJ6VQ9LVHo="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.15.1" - "sha256-hGUdTC5ksWqneEqIROSc3XqYANVrtL2caM+OqTVnlcw="; + buildTypesAiobotocorePackage "resource-groups" "2.15.2" + "sha256-T1gIcrRPXWbfzYReB/MBLcYUjUhiDqbcah/kGKx6g9s="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.1" - "sha256-zJvPU3lXoxxw1LF0HkPTfO7d62Q0mTCuqGKQT/8LbPQ="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.2" + "sha256-fa/EoxdXi5Vd0R2eHexVx9PSiesVyw/0okGpHIGd7I8="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.15.1" - "sha256-X1hQ7pzhlsD9AcD2JdM/1u9W8PGRFnJaWhArHhZLPrk="; + buildTypesAiobotocorePackage "robomaker" "2.15.2" + "sha256-ShnMPJzy/isQNqwYiBBb3B7tEr/ydi6weW/J+Bu6XoU="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.15.1" - "sha256-VjjHrGv8GuQ+4Fd8meBih98YxFpVChvusBZDKJ7jvAA="; + buildTypesAiobotocorePackage "rolesanywhere" "2.15.2" + "sha256-Td97qtNPStvbV/1vILYZ/TTtpngndk/7s1wAORakKeQ="; types-aiobotocore-route53 = - buildTypesAiobotocorePackage "route53" "2.15.1" - "sha256-p1N0+9s+QDRoSkgiRtsmyGrxmse405CDwuPW10r2TFY="; + buildTypesAiobotocorePackage "route53" "2.15.2" + "sha256-olwrQiY0EOvIJMFX/wQKT1dKzIGDlOEMrqvx2cVxOCA="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.1" - "sha256-L27J6hqxLMwxm8r2DK3xc7LrtNOgt5HSBE/YsjqH9c8="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.2" + "sha256-T1kYpmeMmvQOZkxqeCDbab2HNFBcX7I7wc28gB66UHU="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.1" - "sha256-njXhqJ+7xnxabYnNqknXA67I2J88jxHk9oErziic1FU="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.2" + "sha256-/yWRQIwfwZjkDooNl3GmbGrlxD1vSTk/2NrrQpG3IJc="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.1" - "sha256-U0jzrXqfz/X/Dg1S03/is/xkQwIO9ICwg5s/YYImBf4="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.2" + "sha256-1+TJUQ5LPWnHDcR41at5C5lKf92euYVer6BXLfs8r3A="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.15.1" - "sha256-PL1oQYboRsEDlCACZ/f+WORfaj/3pv05XyyZf118cl0="; + buildTypesAiobotocorePackage "route53domains" "2.15.2" + "sha256-xsAKhJBxAWzhCP2lUwcQ9jp4M/Av0nOae+ToMG4p1hQ="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.15.1" - "sha256-P4Iq5h9zo7y0UIcwLml8cCjjP5wKgtxP2EX3KTVPobw="; + buildTypesAiobotocorePackage "route53resolver" "2.15.2" + "sha256-JNzO/R8OfmPhpPBCt2YIS420mXAuKadpB+/h8r1VccY="; types-aiobotocore-rum = - buildTypesAiobotocorePackage "rum" "2.15.1" - "sha256-3WO3zTqIDqRR+bkAdsEg8KxruV43uUKGV86c+7jAKgw="; + buildTypesAiobotocorePackage "rum" "2.15.2" + "sha256-KEjeiHaU2MjBHxDJzFgIZtsfnj/7vEzlixeAu8+KRm4="; types-aiobotocore-s3 = - buildTypesAiobotocorePackage "s3" "2.15.1" - "sha256-nm1iUImUWba9BNV0JUKC1uYWxiFTKLCw3vUBsuqd188="; + buildTypesAiobotocorePackage "s3" "2.15.2" + "sha256-Hr7IrJ3+a7+7OT6zTSkEdnBfq3aNKVjG0h2dv7dScs4="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.15.1" - "sha256-VDIAA8d4/zv5pI1frk6tFZJ9qWtC29b9rZdIYN0YYLA="; + buildTypesAiobotocorePackage "s3control" "2.15.2" + "sha256-4kWotne4SnLV1rEvWJLw/jP+ZiL1BmHQ4uxj/QW2Hb4="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.15.1" - "sha256-3IyAJHmya+ycc0do6H4NZnhn3Duhj/ITiW+b90x7d8o="; + buildTypesAiobotocorePackage "s3outposts" "2.15.2" + "sha256-Dfp04DBqhQBWEokBwtw/ALimFq6ZgzrrV5bZfgG9aQw="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.15.1" - "sha256-kwB5VOix83ehKTJ6cXvR5aHO5ogYQvg3+CAnWEFll1k="; + buildTypesAiobotocorePackage "sagemaker" "2.15.2" + "sha256-jEAVncpRneLhQ7MN5sdwvRexiTXHBRLD1gfRng2LtXk="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.1" - "sha256-qGMnLC7fZA+OEwZNbfCQMJFiwO0mf/1chvMFi0CpIco="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.2" + "sha256-4pAalrOg0umvRj/3xRDsziWl/wHPf+37NhOurtvLJd8="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.15.1" - "sha256-oDvjSp0rQFBDclkyLifawL/hobIcT3RuNXS3IuJmG+4="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.15.2" + "sha256-rCEEed2WVtd506aeYG+KX+ADuqwc3TuYIBO9aGzBjGM="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.1" - "sha256-ynKSN7dB42JJw6DQOpLjwZXSrNvIgqfYrlEaXKE+agw="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.2" + "sha256-y/5KuNWy3832PAvvPxcTFYrGeTS0SOA3cFM6oaQFGD8="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.1" - "sha256-GW0b2GWrahRsWM9p/sS896CLotC4NlHC+Tyya4AbANs="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.2" + "sha256-joXbxcuxaBX4Nl18oFhhSz5AXme0zVcpmw/vWoziNu4="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.1" - "sha256-xT0K4NB2r9ajVEDgTr8tAPtUQLVwZj4/q/9lFxNoRy4="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.2" + "sha256-LgQn2sOOv7dV2XP87XcD5dz8ZulGK5Ny3wl/YLAAguU="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.1" - "sha256-EKfd1G+A7T5A/7h+ZfWm+feD7VCEUU+RohAM8804Th8="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.2" + "sha256-YMgZ7YH3iTjE26HrcOCLLqs3FF+0f8Dil8t5bTA+gRo="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.15.1" - "sha256-fpMpgVdydbNYhse3LemZWeu6pvLuXWYy7Nt3+CSedl0="; + buildTypesAiobotocorePackage "savingsplans" "2.15.2" + "sha256-FQaInT6mcJ+f0YooDo4vVJA7ZKrJv2w3Jg29L1GUe7U="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.15.1" - "sha256-786gr8xrz39LVOuU0EYtyBhUxDbo3YEH5UXzmY4+xSo="; + buildTypesAiobotocorePackage "scheduler" "2.15.2" + "sha256-9HbcEJfpfXXSQvTtYXCN5cQSwisIk57OsF+MYecLFh0="; types-aiobotocore-schemas = - buildTypesAiobotocorePackage "schemas" "2.15.1" - "sha256-JUC3Sa94XRotK9rTelvMVG4TUQyrnVQ9Mdd+byd4A3w="; + buildTypesAiobotocorePackage "schemas" "2.15.2" + "sha256-SvenxkkMais2m/zfzdAehy6Dl5uOZpuBEWq8SWg1z6Q="; types-aiobotocore-sdb = - buildTypesAiobotocorePackage "sdb" "2.15.1" - "sha256-EV0eNjxdjT/JNuTip75SuCVDZfvQz71UbIgUHWfbakc="; + buildTypesAiobotocorePackage "sdb" "2.15.2" + "sha256-/RPhNimi1jEbPiHvJmtkvL/t1dlnYguQsQ2C3uvM9pA="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.15.1" - "sha256-GW4y+JyGelERL39KPMOcF/7+pwGBuPwKhNwecBi5BBg="; + buildTypesAiobotocorePackage "secretsmanager" "2.15.2" + "sha256-js9F7mkNtanyv2AVZPFGs88b21Ng99yQ7Yrc/UP4LKA="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.15.1" - "sha256-ONJsSG+d2fSaoPyrchl+oosIeVSjwoN5d0BPolDhhbk="; + buildTypesAiobotocorePackage "securityhub" "2.15.2" + "sha256-yrI7hTvxsInp64WWMfMvqBx0qkpoYF8fryV2WC7HrCU="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.15.1" - "sha256-ggAfufDDaW+LdNindZoAR1xeWr+hQKr1ImTl+nGE0B8="; + buildTypesAiobotocorePackage "securitylake" "2.15.2" + "sha256-DwJsoRR3NZEVQ3uvploTO3eRqGvMpET96CJm5Gx2kDc="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.15.1" - "sha256-zUBoLdhvpvI/tTza9abj//Hkc59gMe70kqEF1SEW+FE="; + buildTypesAiobotocorePackage "serverlessrepo" "2.15.2" + "sha256-X0o4l4pcJmVnLkA1huf520RqMEFbkMqqs09ZqlFvl8w="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.15.1" - "sha256-M1elV0BE1RyFOo2XlKVIt5gH1M4bIU7rld77+cGCptg="; + buildTypesAiobotocorePackage "service-quotas" "2.15.2" + "sha256-Pbj9G+3rPMNyJ5Z3wQT4Zvqeb7N2H3ui+9CxcpU1oHU="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.15.1" - "sha256-fgFgmDsx68FgZHOXTrJEB6OqVOlaVWgSer29dKwiBJo="; + buildTypesAiobotocorePackage "servicecatalog" "2.15.2" + "sha256-uSkuoDBkYXzGDBLtIX/4tmfFhRFfiWJGHmz5OpJhLek="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.1" - "sha256-NG2E4XxicGVtpLqi8n/j2C+BsxdMyWb554XX/HlnExI="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.2" + "sha256-qxjPzRVuya2L2yedaMejt8S0iNQkec0mRteahClNFDQ="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.15.1" - "sha256-/6OTsZUTgwYXFzTf1G8hkngaN32L8dPJzgdNMSXisfo="; + buildTypesAiobotocorePackage "servicediscovery" "2.15.2" + "sha256-CHvjmH7uPYJ1o97k+/u2GRK7/R0BaDfA6nhyJl3I0+U="; types-aiobotocore-ses = - buildTypesAiobotocorePackage "ses" "2.15.1" - "sha256-H3mZA65etYo+frlSNEMs/lT8G86oWbNjlkPefoIc6AA="; + buildTypesAiobotocorePackage "ses" "2.15.2" + "sha256-3jDEReH8mLWDRDaEBGhXnESbvw5l8OANgl6VnYcbN6I="; types-aiobotocore-sesv2 = - buildTypesAiobotocorePackage "sesv2" "2.15.1" - "sha256-diE7lw1LMxiy4gRam1zymw98VJGKaEWwQ5FudCma9ZU="; + buildTypesAiobotocorePackage "sesv2" "2.15.2" + "sha256-6NbQYkz04lWokHuhFpq3yY60HkXKKQkdXztNjW3XGcc="; types-aiobotocore-shield = - buildTypesAiobotocorePackage "shield" "2.15.1" - "sha256-jeklWyR6ArvO9/i/2Iji+YbAsv2rnNLqKoSTBL5VDSQ="; + buildTypesAiobotocorePackage "shield" "2.15.2" + "sha256-lxGndPfh8XDcj8e8oKydEPcFfzNiSVXHAgv3rxSg11U="; types-aiobotocore-signer = - buildTypesAiobotocorePackage "signer" "2.15.1" - "sha256-I+Cfmn14B9W1O/LBNWZZ9384H0DexJav2bkc4+2zV58="; + buildTypesAiobotocorePackage "signer" "2.15.2" + "sha256-vVkz6+GhJf8J2d/ZTfbTxIVdnWXA/ye/eq4nCtd/Krw="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.15.1" - "sha256-1B4R4cjzz3fnevwRsT4o3mzlzw4tXbO1kENgWOWbU7w="; + buildTypesAiobotocorePackage "simspaceweaver" "2.15.2" + "sha256-JesS1NX79j37T3K2lAaSAoQ3M0SYHgHWW6w5EGkwgoU="; types-aiobotocore-sms = - buildTypesAiobotocorePackage "sms" "2.15.1" - "sha256-w2iD7ZpVIIDRuTWikJAp3j7j7jBfcpPnKXfTm6KWq10="; + buildTypesAiobotocorePackage "sms" "2.15.2" + "sha256-BD4R+N71BtyFQDzCR7e84vovWKkNRagloe5Se/oZJPU="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.15.1" - "sha256-+SZAFFyf+UTytFecjCv/MH9VykOCxFxXJEen1DZdljs="; + buildTypesAiobotocorePackage "sms-voice" "2.15.2" + "sha256-6UwSaemdRzaFk7fI+W1K7HUQTo93CTuoiQfOtvlroog="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.15.1" - "sha256-kaiXmu24wDGIzDtXJ2pT87Wdr3zzRioLVU5TjaNVsRo="; + buildTypesAiobotocorePackage "snow-device-management" "2.15.2" + "sha256-8Qt9oOvwGYiDnCNNRzXKGpSF+cxKbQFErROsWS5NQ6o="; types-aiobotocore-snowball = - buildTypesAiobotocorePackage "snowball" "2.15.1" - "sha256-YvZxBJGNtRVSsJAtv46Nq9xliVvXShiI2exeir+bp8U="; + buildTypesAiobotocorePackage "snowball" "2.15.2" + "sha256-/NDdsd9AcLcpXAs0tqZ+nHHNJudfxVuYatqJHr9a8oo="; types-aiobotocore-sns = - buildTypesAiobotocorePackage "sns" "2.15.1" - "sha256-U/VvZwz7qMrnPjgQUL0NMnNS6e5X4PgW/rjwBi65iAU="; + buildTypesAiobotocorePackage "sns" "2.15.2" + "sha256-7YRa4LucT1Jl8oujdVYsMw/wnRYSSMaZXMaY9qz4mRQ="; types-aiobotocore-sqs = - buildTypesAiobotocorePackage "sqs" "2.15.1" - "sha256-CI9nNt+zfztYT6DwgjAe9RNtebegPAAsSl692FBF7hA="; + buildTypesAiobotocorePackage "sqs" "2.15.2" + "sha256-6R+AHdVU27iziZvPWMzB3iPNaFYvdQkzfHQAOK+PMtI="; types-aiobotocore-ssm = - buildTypesAiobotocorePackage "ssm" "2.15.1" - "sha256-x/b1hpCTHqZcTJTzwQc+pYjdOYCiyQdsLw1vBpuPQyc="; + buildTypesAiobotocorePackage "ssm" "2.15.2" + "sha256-6b8jBjW+dhoaoM/xx08mZAh4EndISChOQL+mZZp14Q4="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.15.1" - "sha256-3N8kaI67M6xKuTsESi/x4FVXy2Lsdoc9RRGIo7bKAok="; + buildTypesAiobotocorePackage "ssm-contacts" "2.15.2" + "sha256-JsJoes3hiMJsOK9fMaO/xSSgyNR8W0KqxsW49sQ/qFo="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.15.1" - "sha256-Fkl8ZgS3DD3hRYWQHl1cM2RCNHi8tWk9a1fyCQa+/KM="; + buildTypesAiobotocorePackage "ssm-incidents" "2.15.2" + "sha256-TZ2mFVwjA3UGCnyVIOFNG6GSF1tWD+SP03g8CZZdr6c="; types-aiobotocore-ssm-sap = - buildTypesAiobotocorePackage "ssm-sap" "2.15.1" - "sha256-23gDeTpYf9sNK2ARSPwZTkNSlGIze8ybLymQ+X0cf74="; + buildTypesAiobotocorePackage "ssm-sap" "2.15.2" + "sha256-nJHnIk+XzFLKeNJ3UdM9NslUeJdFhru6cmvvoZUJmTU="; types-aiobotocore-sso = - buildTypesAiobotocorePackage "sso" "2.15.1" - "sha256-7uJXGduh2yrj0nLWgTyELxdB6ZaU7TX35GywXTECU64="; + buildTypesAiobotocorePackage "sso" "2.15.2" + "sha256-PhoZgQqeNQc3B75O1jIWVNU7lR9uBrJG9GpTfHB1pnI="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.15.1" - "sha256-qTAoxjZnze1ffC/QdVnCRy37H4Tzc1AkAERvvtVxkik="; + buildTypesAiobotocorePackage "sso-admin" "2.15.2" + "sha256-+Ofbw3lAiX3RtygG9zfxX3i87NVdYmIHKKxq+7NTHHE="; types-aiobotocore-sso-oidc = - buildTypesAiobotocorePackage "sso-oidc" "2.15.1" - "sha256-+MsbvjZLLdY/JOr/yWBvrfHQ3SEWvUtzvaImsYNX0YI="; + buildTypesAiobotocorePackage "sso-oidc" "2.15.2" + "sha256-ZhEJ9TSH5zbH0a1ukgxX/XwIKrwxFvh/CF9SOAmAd4o="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.15.1" - "sha256-4YKcuhem2grrKP2I0y+fayyQ4beVhKQJ7KAC70TgN14="; + buildTypesAiobotocorePackage "stepfunctions" "2.15.2" + "sha256-DN3vboRwssrSolCuKts/35RiQR6jV61+QN7Z8cp2f4Y="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.15.1" - "sha256-DDxzE4KcnC4sjVgBMt2cldFgm2JIeA7pRR7lqocvXN8="; + buildTypesAiobotocorePackage "storagegateway" "2.15.2" + "sha256-6ahEEQrrvRI90jGON71iTLRatrEoF7ZyG7qJmG3oCsU="; types-aiobotocore-sts = - buildTypesAiobotocorePackage "sts" "2.15.1" - "sha256-LMs2iAbogup0JrXFBIJhpgn8oFuhH3jGnb/Xh60xsMg="; + buildTypesAiobotocorePackage "sts" "2.15.2" + "sha256-5Ua7GxbzeeX0/8vTxsYgB8jruGv5u16FQ8plGKLMBVw="; types-aiobotocore-support = - buildTypesAiobotocorePackage "support" "2.15.1" - "sha256-fpQ5fan2CkWJrnir65tBHyXAqSa1CVQXt/Q1h7NiyjU="; + buildTypesAiobotocorePackage "support" "2.15.2" + "sha256-nM+vzI5wv8VRyRUok6GaI77VEBcaxeGikldAAvAIAXw="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.15.1" - "sha256-W/uBm0i+eNsPdSpZ+WvxSRJpZTzRdnt4snregNIeghQ="; + buildTypesAiobotocorePackage "support-app" "2.15.2" + "sha256-EhVR5a5O7/XwiRDcIsUS6aZqILArMyxd85XmiNN+M+Y="; types-aiobotocore-swf = - buildTypesAiobotocorePackage "swf" "2.15.1" - "sha256-ijmqVcESbAfQLCgWhIEqq1+V8fChp1Pq0IfeBjmPtPM="; + buildTypesAiobotocorePackage "swf" "2.15.2" + "sha256-/dz5ZVqz6ovntu/O5ON7Gf1o78Nn1FxJOUzcHvwuOwg="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.15.1" - "sha256-mDvgYxDjVc2Z+IGCiaNR3xOYuht1LHJPW1lViQsfsfQ="; + buildTypesAiobotocorePackage "synthetics" "2.15.2" + "sha256-akHP8h2XxNvHVku5uCTQ3K8HgwWRg9QL1BAQRzQ3eEc="; types-aiobotocore-textract = - buildTypesAiobotocorePackage "textract" "2.15.1" - "sha256-HLjYbm4OK2gvKMKBkNZytKlChMW43y8g2k0CMVVvcGY="; + buildTypesAiobotocorePackage "textract" "2.15.2" + "sha256-Wt8E53/j9mi0yJWp/+omVnIBoI5sVMJPgR4BofB+6nM="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.15.1" - "sha256-Jx3U+EzIZzTntyq5YxlSJkHQaGX3JkKqCOlHtGqO7vY="; + buildTypesAiobotocorePackage "timestream-query" "2.15.2" + "sha256-7oi/qslTdLXQGVzsucF09PT+A1gyncYXdNoY0aZZwnA="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.15.1" - "sha256-h1eonOUwVXsybJ25UfQwZtZWuhDh1v8M10ZT9JM1NVo="; + buildTypesAiobotocorePackage "timestream-write" "2.15.2" + "sha256-oOPC3wV2Wutveglu9vd6bNl9MGWxsJhyxn1h3R5h3DU="; types-aiobotocore-tnb = - buildTypesAiobotocorePackage "tnb" "2.15.1" - "sha256-6b9c2UdaNHM3/GAiGWFnZVR7sUP+cUy9Z5W3Ig+7fSM="; + buildTypesAiobotocorePackage "tnb" "2.15.2" + "sha256-rxiCacHIc1+JX5Ba+Ft3kaZfxPOuQzDbsK/wxPJi4VA="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.15.1" - "sha256-bLQrTDUhbYOTYY+KvUxMwiHgPFHrAJxB8Yjy3TUAMCc="; + buildTypesAiobotocorePackage "transcribe" "2.15.2" + "sha256-IMJBlNAWIlk0FWLQQ/2Gcyk6ePqicSqOkDvIxuc+yjg="; types-aiobotocore-transfer = - buildTypesAiobotocorePackage "transfer" "2.15.1" - "sha256-+cSgukEugB7RSrkWsEgbiMS6tvjAJDPwVP+rVEsAMJE="; + buildTypesAiobotocorePackage "transfer" "2.15.2" + "sha256-M0bTj75PMhNE4Z1Cw8Mb5qlqN3NFkqyWPMi2T5IHnH0="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.15.1" - "sha256-Hf46I5GHQyLAN6IXL0X0VN6Mr3CsMhhPFKqx/fDrHv8="; + buildTypesAiobotocorePackage "translate" "2.15.2" + "sha256-OJYflZHEP6xshavrMsdALZ1W7OFGlXTcZ2y7lSZFiiM="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.15.1" - "sha256-yxamVPkF/RexBvdBpjUi8rYzEy5jOf15otKqi64gnOc="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.15.2" + "sha256-jzG0vdPOF7gtAVdT4zUbQ9on9hGZ0r7Ip3BPJYVFk6I="; types-aiobotocore-voice-id = - buildTypesAiobotocorePackage "voice-id" "2.15.1" - "sha256-B7Q0TAT7rMWVZf4wSE6qGxMalHwvV7hPrcnCw3vcQkw="; + buildTypesAiobotocorePackage "voice-id" "2.15.2" + "sha256-AG6/UuYdeYOjECyemoqB7BrjIDg6OuIbIfdCaSsgc7Y="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.15.1" - "sha256-ybBzzhKX3NClXHnYR7GBpQZGsF+xPprHrbHgOjeR+9U="; + buildTypesAiobotocorePackage "vpc-lattice" "2.15.2" + "sha256-pSrj/6I5X4EAiBGtP/usG8AnDFrExtV7wpCMIYjdmLI="; types-aiobotocore-waf = - buildTypesAiobotocorePackage "waf" "2.15.1" - "sha256-YPYrL6RRL0UhABcDZXpJQ8RQWDvPkD+y/qDQ1PbLCuU="; + buildTypesAiobotocorePackage "waf" "2.15.2" + "sha256-rdMMNnCkv1+sCL+4lB5ubSWAyPvBrNDuLZcqFAky6kI="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.15.1" - "sha256-fkKB2Cmg0i/OOJKkHmLzU0UWkUDXVAjXYmBWpal6pg4="; + buildTypesAiobotocorePackage "waf-regional" "2.15.2" + "sha256-FqUfQlM41v6q5SdlSgzBt/MnK3SiDYdGKpqNnlcKMXQ="; types-aiobotocore-wafv2 = - buildTypesAiobotocorePackage "wafv2" "2.15.1" - "sha256-f5xAh/57zMcvjJHeqDDSrlSx3u/J3e78oQmGVSyD4Vc="; + buildTypesAiobotocorePackage "wafv2" "2.15.2" + "sha256-wOVJrIL5F7qapff49bWw2NfX3p+fr2KiLyDU0UIKMDg="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.15.1" - "sha256-j1yGNqM32RKzz5xmL52+cwS9JIj1DUIJQatHz7ZjZrg="; + buildTypesAiobotocorePackage "wellarchitected" "2.15.2" + "sha256-srXL51+IeqOadPa8TFSA3BZEPQbw51zgsuRTbDJlACw="; types-aiobotocore-wisdom = - buildTypesAiobotocorePackage "wisdom" "2.15.1" - "sha256-0rngVEUa9yBIeoMC2dKVVDty4DAiesQZJRm73C4PAhg="; + buildTypesAiobotocorePackage "wisdom" "2.15.2" + "sha256-p0KPHHmqy9Jd4tWypg+5AcnEHb0dESwNVC6bPr1VDBc="; types-aiobotocore-workdocs = - buildTypesAiobotocorePackage "workdocs" "2.15.1" - "sha256-Jypse/lhsvGWfu8551dngM+Jp8BdIp2T1WRfqdV02ug="; + buildTypesAiobotocorePackage "workdocs" "2.15.2" + "sha256-csR9+vedxQbUu16e3fCwSTW4opv2FW7VnNXsfawJGSk="; types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.15.1" @@ -1456,18 +1456,18 @@ rec { "sha256-o2n4u7wgJPSS02LLZe+PLsxdwm5r+0j3VzDFVnR7bGc="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.15.1" - "sha256-PQQLKPZYaCqIVTXS8PWAjrYjp4ZTMl1XDuvz27s10sY="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.15.2" + "sha256-2Rb15SCI1o6OfMuJzWcosZqWZQOs0ZrPGLDy7bdZPPk="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.15.1" - "sha256-eU+8eBZ52BEAqpvHWJ4aVr2kuz6/6fMu7yu4bA9f/TQ="; + buildTypesAiobotocorePackage "workspaces" "2.15.2" + "sha256-wQSb23Y6nySclLl9c2MCfiZ81N+GKbYhHcro6zBVtNo="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.15.1" - "sha256-+lUuiVz/wqkuH59QzB8ZIv+bvNGeNZvBDzUctYd6LAg="; + buildTypesAiobotocorePackage "workspaces-web" "2.15.2" + "sha256-oFljA4OPlPF4q9xMMxhtv2/t5FQcwUeGdBC3ueGCnKA="; types-aiobotocore-xray = - buildTypesAiobotocorePackage "xray" "2.15.1" - "sha256-+MKFgYPnSmSLjE9YP8fDjAo91o+mYkN2T4FbOMVSmnw="; + buildTypesAiobotocorePackage "xray" "2.15.2" + "sha256-coVjEy0/Kt0gkLS/MI/r1WpXvbJJeCMfGUfCYH7SNPY="; } From 00832ce3e520de8ed5d809855e05077e17d1f440 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 00:27:57 +0200 Subject: [PATCH 132/215] python312Packages.yfinance: 0.2.44 -> 0.2.48 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.2.44...0.2.48 Changelog: https://github.com/ranaroussi/yfinance/blob/0.2.48/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index b49e0e4cbd82..36a381551864 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.44"; + version = "0.2.48"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-XaenqZMvbimuptfCpvyhXxvbJTPA94+nN938HI5gDQo="; + hash = "sha256-7m5N2l80Cg6+NDiW0x49WtHkc6fu07s0BqKlHFCc1v0="; }; build-system = [ setuptools ]; From c6f4b0685e8bbafc8a6a9ab3b0b16af29c36873f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 00:29:25 +0200 Subject: [PATCH 133/215] python312Packages.yaramod: 3.23.0 -> 4.0.0 Diff: https://github.com/avast/yaramod/compare/refs/tags/v3.23.0...v4.0.0 Changelog: https://github.com/avast/yaramod/blob/v4.0.0/CHANGELOG.md --- pkgs/development/python-modules/yaramod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 78589108f7e0..3bf6ba1b7546 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.23.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TB0dnWA+5beyHAoYUjqocmw5uGFgo/h9eKDbuKbmfsw="; + hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o="; }; postPatch = '' From 8006c78d36ba6cd8e99dcba12b78b9e927bea62f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 23:24:33 +0000 Subject: [PATCH 134/215] snazy: 0.53.0 -> 0.54.0 --- pkgs/development/tools/snazy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index a5fee4c38c24..0eb2b588f25d 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-iRoNmqZadwUxowcC/emqdGhOWMl5c1OJr/VVyxYg2h0="; + hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ="; }; - cargoHash = "sha256-e39lmGEPRU/vATcJKB89+B/STi1viP6r43X4Y2u/fe4="; + cargoHash = "sha256-NmnKWVyD+NrP7ReERQB1/K8hyrSFj6qgjQjYwxZc+OY="; nativeBuildInputs = [ installShellFiles ]; From c8874bbb84758f60040818eb437ef92fcbefda15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 23:29:33 +0000 Subject: [PATCH 135/215] spicedb: 1.37.0 -> 1.37.1 --- pkgs/servers/spicedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 530ada2bb527..78b73b158555 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "spicedb"; - version = "1.37.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-ClBT0S5pb/XRQftvbnwqGJE6SBuGQCvb/A8oY/tv0/c="; + hash = "sha256-15X9Q6akidXTYO5U3MYi14u8shTicQQ9wGSVOcefxhg="; }; vendorHash = "sha256-aTfjSGen9rJ/GTCUFuuEykNqQNsnuNyRGm7CtMSZoJ0="; From 27f2eeb8699f25feb907e0ac20c7a21ed7f86bf5 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Sun, 27 Oct 2024 01:07:58 +0000 Subject: [PATCH 136/215] headache: add codesign for darwin --- pkgs/development/tools/headache/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/development/tools/headache/default.nix index b5f5e55f3f79..93077f31104d 100644 --- a/pkgs/development/tools/headache/default.nix +++ b/pkgs/development/tools/headache/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, nix-update-script, ocamlPackages }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, ocamlPackages, darwin }: let inherit (ocamlPackages) buildDunePackage camomile; @@ -15,6 +15,8 @@ buildDunePackage rec { sha256 = "sha256-UXQIIsCyJZN4qos7Si7LLm9vQueOduUmLeYHuyT2GZo="; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool; + propagatedBuildInputs = [ camomile ]; From a5538fe87beade78587b193cb801cd5abb09a99a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 01:35:50 +0000 Subject: [PATCH 137/215] cargo-hack: 0.6.31 -> 0.6.32 --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index f85d1459c8ae..923867851b5d 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.31"; + version = "0.6.32"; src = fetchCrate { inherit pname version; - hash = "sha256-PMqGDwiQYTtPna4buO6pxUjF+RXT9phjPUNcpQQSn6Q="; + hash = "sha256-XjubvjK+FySm0nqlzFsRhDQOI9M0enonwwPhZ/KFFlk="; }; - cargoHash = "sha256-/bkGWQZAHkMtH6Y9ntFJEKV6gmUZEAbYf5A5xoUOMM8="; + cargoHash = "sha256-sWXeGohH9iLMkmBgNjSfg25eDzZHSzWrOGgccuWPBLM="; # some necessary files are absent in the crate version doCheck = false; From db9dc29fe39599203065fa40f98277fbb675db11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 03:11:31 +0000 Subject: [PATCH 138/215] python312Packages.aiokafka: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/aiokafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index c44bf8e44468..085ad7eb2d10 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiokafka"; rev = "refs/tags/v${version}"; - hash = "sha256-CeEPRCsf2SFI5J5FuQlCRRtlOPcCtRiGXJUIQOAbyCc="; + hash = "sha256-OU/Kept3TvMfGvVCjSthfZnfTX6/T0Fy3PS/ynrV3Cg="; }; build-system = [ From 2fc90bb125b300f8684c989c12f339dc1f30157b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 03:31:55 +0000 Subject: [PATCH 139/215] python312Packages.pwlf: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/pwlf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 95dbc3ac83b8..c5341cd1cd75 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pwlf"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "cjekel"; repo = "piecewise_linear_fit_py"; - rev = "v${version}"; - hash = "sha256-gjdahulpHjBmOlKOCPF9WmrWe4jn/+0oVI4o09EX7qE="; + rev = "refs/tags/v${version}"; + hash = "sha256-FAH38mSaABdNR8lpxxA/YVo5ec2WYOMEsAQqravbM9k="; }; nativeBuildInputs = [ From ca5590df32b5cf54fd94711f3c3ddbb10c5aa3ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 03:37:39 +0000 Subject: [PATCH 140/215] python312Packages.nexusformat: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/nexusformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 7a9ea2e698be..0c92f822f761 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { pname = "nexusformat"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UxU3PA/2r/uamdysbfC0L2JinHgfkXhssHIo2hf3zlA="; + hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM="; }; pyproject = true; From 5594ad2bc07412d632ea7e92fc8878520725201b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 04:22:08 +0000 Subject: [PATCH 141/215] sopwith: 2.5.0 -> 2.6.0 --- pkgs/by-name/so/sopwith/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix index fe6fb0c147d3..0c006b405f8c 100644 --- a/pkgs/by-name/so/sopwith/package.nix +++ b/pkgs/by-name/so/sopwith/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sopwith"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "fragglet"; repo = "sdl-sopwith"; rev = "refs/tags/sdl-sopwith-${version}"; - hash = "sha256-e7/Cv/v5NhYG5eb9B5oVxh/Dbmm2v4Y4KUKI4JI5SFw="; + hash = "sha256-sjg61QgcQDSQ/qrR+4PEZIf8OOnGBZvUSLCKGpS1bwg="; }; nativeBuildInputs = [ From 0176513c39e05947b1be5b839c4414f8342c1518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 04:22:24 +0000 Subject: [PATCH 142/215] python312Packages.willow: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/willow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 83b446947683..13396dad5541 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "willow"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "wagtail"; repo = "Willow"; rev = "refs/tags/v${version}"; - hash = "sha256-g9/v56mdo0sJe5Pl/to/R/kXayaKK3qaYbnnPXpFjXE="; + hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk="; }; nativeBuildInputs = [ flit-core ]; From 095d47ad1c1dbbfaced6dc2c29d7f06db4f455f0 Mon Sep 17 00:00:00 2001 From: airRnot1106 Date: Sat, 26 Oct 2024 22:50:19 +0900 Subject: [PATCH 143/215] maintainers: add airrnot --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 19ab24360d23..74b4cd1b62bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -743,6 +743,11 @@ githubId = 37664775; name = "Yuto Oguchi"; }; + airrnot = { + name = "airRnot"; + github = "airRnot1106"; + githubId = 62370527; + }; airwoodix = { email = "airwoodix@posteo.me"; github = "airwoodix"; From 3d916bdece85970722c306c6a449d94225b2ad54 Mon Sep 17 00:00:00 2001 From: airRnot1106 Date: Sat, 26 Oct 2024 22:54:35 +0900 Subject: [PATCH 144/215] kdlfmt: init at 0.0.3 --- pkgs/by-name/kd/kdlfmt/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/kd/kdlfmt/package.nix diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix new file mode 100644 index 000000000000..a5b5d371072e --- /dev/null +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "kdlfmt"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "hougesen"; + repo = "kdlfmt"; + rev = "v${version}"; + hash = "sha256-qD1NYLHGmVRgV6pPXbvJ9NWDg/wVLWJY4hUsOLDlKh0="; + }; + + cargoHash = "sha256-7HSDz/JI5VuTdM/Hv+nq+ddpQg31Q1v7Ct5gz2PfdmE="; + + meta = { + description = "Formatter for kdl documents"; + homepage = "https://github.com/hougesen/kdlfmt.git"; + changelog = "https://github.com/hougesen/kdlfmt/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ airrnot ]; + mainProgram = "kdlfmt"; + }; +} From db2dcfb6f741e204af44e01c7d930754b0d550da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Oct 2024 21:49:23 -0700 Subject: [PATCH 145/215] mollysocket: 1.4.1 -> 1.5.1 Diff: https://github.com/mollyim/mollysocket/compare/1.4.1...1.5.1 Changelog: https://github.com/mollyim/mollysocket/releases/tag/1.5.1 --- nixos/tests/mollysocket.nix | 4 +--- pkgs/by-name/mo/mollysocket/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/tests/mollysocket.nix b/nixos/tests/mollysocket.nix index 8cbd0c0272e0..5135d79fcba9 100644 --- a/nixos/tests/mollysocket.nix +++ b/nixos/tests/mollysocket.nix @@ -16,12 +16,10 @@ in { }; testScript = '' - import json - mollysocket.wait_for_unit("mollysocket.service") mollysocket.wait_for_open_port(${toString port}) out = mollysocket.succeed("curl --fail http://127.0.0.1:${toString port}") - assert json.loads(out)["mollysocket"]["version"] == "${toString pkgs.mollysocket.version}" + assert "Version ${pkgs.mollysocket.version}" in out ''; }) diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index 6c9e18cc8f15..c282bbba2630 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "mollysocket"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "mollyim"; repo = "mollysocket"; rev = version; - hash = "sha256-vE5J4BKYmVqtowfxDDTOwFKws7phYRm9xKFPiDNuNn4="; + hash = "sha256-RRnMmdyr4FZHsdLjGvTRiSw+YC+OutWqsoEId7ZlSX0="; }; - cargoHash = "sha256-s/EhX5o6XuUqcrqhXY274MyWhRukgetfIZKQ4XNlq6Y="; + cargoHash = "sha256-BXllzuw01ANrk+osUsAlMyLRAptvxGO+rl0ygsCfewU="; nativeBuildInputs = [ pkg-config From c387b01c7dec0d243984051d3a43daa2d9a9a616 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 27 Oct 2024 00:10:16 -0400 Subject: [PATCH 146/215] zip2hashcat: init at 1.0 --- pkgs/by-name/zi/zip2hashcat/package.nix | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/zi/zip2hashcat/package.nix diff --git a/pkgs/by-name/zi/zip2hashcat/package.nix b/pkgs/by-name/zi/zip2hashcat/package.nix new file mode 100644 index 000000000000..1c18f21a9914 --- /dev/null +++ b/pkgs/by-name/zi/zip2hashcat/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ... +}: + +stdenv.mkDerivation rec { + pname = "zip2hashcat"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "hashstation"; + repo = "zip2hashcat"; + # Upstream 1.0 tag has no content + rev = "462bd94ea30d69a0810ca9bb3d056aa0f5393d57"; + hash = "sha256-+hbDTGSDUxA7M8gBI/TViJ2ZvheNxlonYC/aFLvgPW8="; + }; + + buildPhase = '' + runHook preBuild + + $CC zip2hashcat.c -o zip2hashcat + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv zip2hashcat $out/bin/zip2hashcat + + runHook postInstall + ''; + + meta = { + description = "Processes input ZIP files into a format suitable for use with hashcat"; + homepage = "https://github.com/hashstation/zip2hashcat"; + license = lib.licenses.mit; + changelog = "https://github.com/hashstation/zip2hashcat/releases/tag/${version}"; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "zip2hashcat"; + platforms = lib.platforms.all; + }; +} From f7300dc4da0a137d94f7bde47371ed8ca4f00825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Oct 2024 22:33:27 -0700 Subject: [PATCH 147/215] python312Packages.py-madvr2: 1.6.32 -> 1.6.33 Diff: https://github.com/iloveicedgreentea/py-madvr/compare/refs/tags/1.6.32...v1.6.33 Changelog: https://github.com/iloveicedgreentea/py-madvr/releases/tag/v1.6.33 --- pkgs/development/python-modules/py-madvr2/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix index 05799d43226a..32eb2a7c6667 100644 --- a/pkgs/development/python-modules/py-madvr2/default.nix +++ b/pkgs/development/python-modules/py-madvr2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-madvr2"; - version = "1.6.32"; + version = "1.6.33"; pyproject = true; src = fetchFromGitHub { owner = "iloveicedgreentea"; repo = "py-madvr"; - rev = "refs/tags/${version}"; - hash = "sha256-yD8DNhYG9oauEGKnX8Qnh0oSwG/AZa8FIRtHVq4DyTE="; + rev = "refs/tags/v${version}"; + hash = "sha256-z+PVLz9eApGJ94I/Jp0MyqNpKQwIemk8j+OyqFmIbgI="; }; build-system = [ setuptools ]; @@ -28,11 +28,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/iloveicedgreentea/py-madvr/issues/12 - doCheck = false; - meta = { - changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${version}"; + changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Control MadVR Envy over IP"; homepage = "https://github.com/iloveicedgreentea/py-madvr"; license = lib.licenses.mit; From fe638e6c1320d9b56969a8acba865b4c664e1e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 10:27:01 -0700 Subject: [PATCH 148/215] python312Packages.stringzilla: init at 3.10.5 --- .../python-modules/stringzilla/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/stringzilla/default.nix diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix new file mode 100644 index 000000000000..7fc432e3ea19 --- /dev/null +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -0,0 +1,59 @@ +{ + buildPythonPackage, + cargo, + fetchFromGitHub, + lib, + numpy, + pytest-repeat, + pytestCheckHook, + rustPlatform, + rustc, + setuptools, +}: + +buildPythonPackage rec { + pname = "stringzilla"; + version = "3.10.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ashvardanian"; + repo = "stringzilla"; + rev = "refs/tags/v${version}"; + hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA="; + }; + + build-system = [ + setuptools + ]; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + pythonImportsCheck = [ "stringzilla" ]; + + nativeCheckInputs = [ + numpy + pytest-repeat + pytestCheckHook + ]; + + pytestFlagsArray = [ "scripts/test.py" ]; + + meta = { + changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances"; + homepage = "https://github.com/ashvardanian/stringzilla"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e4926959ab1..04bb9d80393b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15135,6 +15135,8 @@ self: super: with self; { stringparser = callPackage ../development/python-modules/stringparser { }; + stringzilla = callPackage ../development/python-modules/stringzilla { }; + stripe = callPackage ../development/python-modules/stripe { }; striprtf = callPackage ../development/python-modules/striprtf { }; From 904064720c402671e165e1c913dc98e0870b424d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Oct 2024 10:15:54 -0700 Subject: [PATCH 149/215] python312Packages.albucore: 0.0.17 -> 0.0.19 Diff: https://github.com/albumentations-team/albucore/compare/refs/tags/0.0.17...0.0.19 Changelog: https://github.com/albumentations-team/albucore/releases/tag/0.0.18 https://github.com/albumentations-team/albucore/releases/tag/0.0.19 --- pkgs/development/python-modules/albucore/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 07f2e3f4ce72..285c643038d7 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -7,21 +7,21 @@ pytestCheckHook, numpy, opencv4, - typing-extensions, + stringzilla, }: buildPythonPackage rec { pname = "albucore"; - version = "0.0.17"; + version = "0.0.19"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-9fv5jewfL3JKhZyD0YS1WDNZ7wWt+8iF2DcygCOl168="; + hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw="; }; pythonRemoveDeps = [ "opencv-python" ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { dependencies = [ numpy opencv4 - typing-extensions + stringzilla ]; pythonImportsCheck = [ "albucore" ]; From 3a08e4434d36323c66b7938b3e422962e485242f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Oct 2024 22:38:05 -0700 Subject: [PATCH 150/215] python312Packages.albumentations: 1.4.18 -> 1.4.20 Diff: https://github.com/albumentations-team/albumentations/compare/refs/tags/1.4.18...1.4.20 Changelog: https://github.com/albumentations-team/albumentations/releases/tag/1.4.19 https://github.com/albumentations-team/albumentations/releases/tag/1.4.20 --- pkgs/development/python-modules/albumentations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index 1f44d339500d..a613b6340754 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.4.18"; + version = "1.4.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; rev = "refs/tags/${version}"; - hash = "sha256-uAYnbglBT1mduyRnsWWjZ8axG7DzZEVcgAVeMLF48oM="; + hash = "sha256-lyYbkO2J3kpZGk8Q3FYfRiQh+BdolCfeEcjlI3W/rIw="; }; patches = [ From adef663e98d5f173fbe046ed15c08811a98291b5 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Thu, 17 Oct 2024 13:05:06 +0800 Subject: [PATCH 151/215] clouddrive2: init at 0.7.21 --- pkgs/by-name/cl/clouddrive2/package.nix | 68 +++++++++++++++++++++++++ pkgs/by-name/cl/clouddrive2/update.sh | 25 +++++++++ 2 files changed, 93 insertions(+) create mode 100644 pkgs/by-name/cl/clouddrive2/package.nix create mode 100755 pkgs/by-name/cl/clouddrive2/update.sh diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix new file mode 100644 index 000000000000..c15a390b2a3a --- /dev/null +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + versionCheckHook, +}: +let + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "clouddrive2"; + version = "0.7.21"; + + src = fetchurl { + url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; + hash = + { + x86_64-linux = "sha256-U8th7cEAFDBg+CV6DEX0YnqaM2+NJNKmyA/IRtnWESo="; + aarch64-linux = "sha256-LaAVO4p0sSfsGmFPSzly1Hzo+t4oY6mgaTdnHrhu0vI="; + x86_64-darwin = "sha256-/cyLcX7A+WpuS6yciqAz3jvDIJvXEoyQyX+xe6+eRmE="; + aarch64-darwin = "sha256-Y5cKIHVzX0TjMNZGW3YvU8MNpuGsIjp4qNlB+b2BRJM="; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/opt/clouddrive2 + cp -r wwwroot "$out/opt/clouddrive2/wwwroot" + cp -r clouddrive "$out/opt/clouddrive2/clouddrive" + makeWrapper $out/opt/clouddrive2/clouddrive $out/bin/clouddrive + + runHook postInstall + ''; + + nativeInstallCheckPhaseInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = ./update.sh; + + meta = { + homepage = "https://www.clouddrive2.com"; + changelog = "https://github.com/cloud-fs/cloud-fs.github.io/releases/tag/v${finalAttrs.version}"; + description = "Multi-cloud drives management tool supporting mounting cloud drives locally"; + longDescription = '' + CloudDrive is a powerful multi-cloud drive management tool that provides a multi-cloud + drive solution that includes local mounting of cloud drives. It supports lots of cloud + drives in China. + ''; + mainProgram = "clouddrive"; + license = lib.licenses.unfree; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ ltrump ]; + }; +}) diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh new file mode 100755 index 000000000000..200bb47700fe --- /dev/null +++ b/pkgs/by-name/cl/clouddrive2/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts + +latestTag=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/cloud-fs/cloud-fs.github.io/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; clouddrive2.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi +for i in \ + "x86_64-linux linux-x86_64" \ + "aarch64-linux linux-aarch64" \ + "x86_64-darwin macos-x86_64" \ + "aarch64-darwin macos-aarch64"; do + set -- $i + prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz") + hash=$(nix-hash --type sha256 --to-sri $prefetch) + + update-source-version clouddrive2 $latestVersion $hash --system=$1 --ignore-same-version +done From c245d2a357602ed0d7328dc913f6c645f8825758 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 06:05:45 +0000 Subject: [PATCH 152/215] chatblade: 0.6.4 -> 0.7.0 --- pkgs/applications/misc/chatblade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 696cf52ba414..3927c57950ac 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.6.4"; + version = "0.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-d8XavZBuWsuIUxraC2XaWM6tgo2JmsPZwzyl9Rj5wWM="; + hash = "sha256-v6X5aqArhp33bm8JELDCUoxE3nsvla4I3n0ZLLMMeJI="; }; doCheck = false; # there are no tests From c870e0658fa84373d8a9a175802b807bf64f9ac1 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sun, 27 Oct 2024 06:34:46 +0000 Subject: [PATCH 153/215] maintainers: update dump_stack --- maintainers/maintainer-list.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddaec91ae408..5d6950a0b192 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5871,7 +5871,10 @@ github = "jollheef"; githubId = 1749762; name = "Mikhail Klementev"; - keys = [ { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; } ]; + keys = [ + { fingerprint = "5AC8 C9A1 68C7 9451 1A91 2295 C990 5BA7 2B5E 02BB"; } + { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; } + ]; }; dunxen = { email = "git@dunxen.dev"; From a0c6ffc324133b4b8b0012ec4e5cec37e375f998 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sun, 27 Oct 2024 07:07:21 +0000 Subject: [PATCH 154/215] minidjvu: mark as vulnerable See https://github.com/NixOS/nixpkgs/issues/90896 --- pkgs/applications/graphics/minidjvu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index a8d3db4d0a94..c656eb84f75c 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "minidjvu"; + knownVulnerabilities = [ + "minidjvu is vulnerable to a number of out-of-bound read vulnerabilities, potentially causing denials of service (CVE-2017-12441, CVE-2017-12442, CVE-2017-12443, CVE-2017-12444, CVE-2017-12445)" + ]; }; } From 52859ba82605958249d8dab3e8fa7fae73d8cfc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 07:17:52 +0000 Subject: [PATCH 155/215] nwg-panel: 0.9.40 -> 0.9.48 --- pkgs/by-name/nw/nwg-panel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index fba077d5c556..11e886a482b7 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.40"; + version = "0.9.48"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-MymxhQxPS07qZlD+TsiMyMtOrmIuqi3LAhc0Huxwxjs="; + hash = "sha256-/PMUkD2kr8aqmohStntlTOc5XgfR+A3LaeYsk04GvOM="; }; # No tests From 203af243af4624cccc171fec49d672bf50d16616 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 27 Oct 2024 08:30:43 +0100 Subject: [PATCH 156/215] postgresql17Packages: mark remaining extensions as broken Those extensions don't support building with PostgreSQL 17, yet. To make sure they will show up as build failures after the next package upgrade, they all have version checks for their own package version included. --- pkgs/servers/sql/postgresql/ext/age.nix | 2 ++ pkgs/servers/sql/postgresql/ext/citus.nix | 5 ++++- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 3 +++ pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix | 5 ++++- pkgs/servers/sql/postgresql/ext/repmgr.nix | 3 +++ pkgs/servers/sql/postgresql/ext/timescaledb.nix | 7 ++++++- pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 3 +++ 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index b80d1c203b2c..695a0093c225 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -2,6 +2,8 @@ let hashes = { + # Issue tracking PostgreSQL 17 support: https://github.com/apache/age/issues/2111 + # "17" = ""; "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw="; "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM="; "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E="; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 28d6139f0a50..b4c08b4ceab1 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features - broken = versionOlder postgresql.version "14"; + broken = versionOlder postgresql.version "14" || + # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 + # Check after next package update. + (versionAtLeast postgresql.version "17" && version == "12.1.2"); description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 42d055a029ae..74bf0b8eda64 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -28,5 +28,8 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; + # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048 + # Check after next package update. + broken = versionAtLeast postgresql.version "17" && version == "2.1"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index e8b3af416ca7..117319e606f0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -93,7 +93,10 @@ in meta = with lib; { # Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14"); + broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14") || + # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 + # Check after next package update. + versionAtLeast postgresql.version "17" && version == "0.3.0"; description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 565f3fdaf60d..728f3b348c69 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { license = licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = with maintainers; [ zimbatm ]; + # PostgreSQL 17 support issue upstream: https://github.com/EnterpriseDB/repmgr/issues/856 + # Check after next package update. + broken = versionAtLeast postgresql.version "17" && version == "5.4.1"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index bd2d2d3b74be..60e14e922835 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = postgresql.meta.platforms; license = with licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "13"; + broken = versionOlder postgresql.version "13" || + # timescaledb supports PostgreSQL 17 from 2.17.0 on: + # https://github.com/timescale/timescaledb/releases/tag/2.17.0 + # We can't upgrade to it, yet, because this would imply dropping support for + # PostgreSQL 13, which is a breaking change. + (versionAtLeast postgresql.version "17" && version == "2.14.2"); }; } diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 0776fcb4468a..ab414a400d29 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -39,5 +39,8 @@ maintainers = with maintainers; [ typetetris ]; platforms = postgresql.meta.platforms; license = licenses.tsl; + # PostgreSQL 17 support issue upstream: https://github.com/timescale/timescaledb-toolkit/issues/813 + # Check after next package update. + broken = versionAtLeast postgresql.version "17" && version == "1.18.0"; }; } From 635e6b428593e303df30ef5c013d9a8d126cf831 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:36:21 +0100 Subject: [PATCH 157/215] prowler: update dependencies --- pkgs/by-name/pr/prowler/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index de0cfe6a2614..b24b00a53467 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { boto3 botocore colorama + cryptography dash dash-bootstrap-components detect-secrets @@ -52,12 +53,13 @@ python3.pkgs.buildPythonApplication rec { google-auth-httplib2 jsonschema kubernetes + microsoft-kiota-abstractions msgraph-sdk - msrestazure numpy pandas py-ocsf-models pydantic + python-dateutil pytz schema shodan From aafcf0431c5217487ba7fd34c97f8c909274c400 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:40:27 +0100 Subject: [PATCH 158/215] python312Packages.appthreat-vulnerability-db: 6.1.0 -> 6.1.1 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v6.1.0...v6.1.1 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v6.1.1 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 01ed99cb621b..aa9fd60a8a4c 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-phqlzL2t7wv1Fxi8ZdTospcpHRcS9Q+mlpKRP6VeB4o="; + hash = "sha256-FISV+wEpoRVfHNjN/fZw7aqFp5XDvB21ZhQhRQvCnHY="; }; pythonRelaxDeps = [ From 42a5e01057f3f79c904181378061c755339e184a Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 26 Oct 2024 16:13:19 +0300 Subject: [PATCH 159/215] warp-plus: init at 1.2.4 --- pkgs/by-name/wa/warp-plus/package.nix | 52 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/by-name/wa/warp-plus/package.nix diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix new file mode 100644 index 000000000000..ec80044aae4f --- /dev/null +++ b/pkgs/by-name/wa/warp-plus/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + + nix-update-script, + testers, + warp-plus, +}: + +buildGoModule rec { + pname = "warp-plus"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "bepass-org"; + repo = "warp-plus"; + rev = "v${version}"; + hash = "sha256-fFyYch14JqXSmnplPJ8c3epOxromZmEJAdcuSgkKbcM="; + }; + + vendorHash = "sha256-/rBZqrX9xZT8yOZwynkOOQyPl0govNmvsEqWVxsuvB4="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestConcurrencySafety" + "TestTwoDevicePing" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = warp-plus; }; + }; + + meta = { + description = "Warp + Psiphon, an anti censorship utility for Iran"; + homepage = "https://github.com/bepass-org/warp-plus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paveloom ]; + mainProgram = "warp-plus"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc47d2ca4b0f..8d9ca1930806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33284,6 +33284,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; + warp-plus = callPackage ../by-name/wa/warp-plus/package.nix { + buildGoModule = buildGo122Module; + }; + warpd = callPackage ../applications/misc/warpd { }; watershot = callPackage ../applications/misc/watershot { }; From 79618982937dd9cb2eb9e70165d94f875c074b41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:51:27 +0100 Subject: [PATCH 160/215] python312Packages.willow: refactor - add changelog to meta - disable on unsupported Python releases - remove superfluous comments --- .../python-modules/willow/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 13396dad5541..367a615f9c27 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,30 +1,25 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - flit-core, - - # dependencies - filetype, defusedxml, - - # optional-dependencies - pillow-heif, - - # tests + fetchFromGitHub, + filetype, + flit-core, numpy, opencv4, + pillow-heif, pillow, pytestCheckHook, + pythonOlder, wand, }: buildPythonPackage rec { pname = "willow"; version = "1.9.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wagtail"; @@ -33,11 +28,11 @@ buildPythonPackage rec { hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; pythonRelaxDeps = [ "defusedxml" ]; - propagatedBuildInputs = [ + dependencies = [ filetype defusedxml ]; @@ -57,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; homepage = "https://github.com/torchbox/Willow/"; + changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; From 3042d0c97cd210995b823bb85ca93eacab26fd7a Mon Sep 17 00:00:00 2001 From: angel-val Date: Sun, 27 Oct 2024 20:52:49 +1300 Subject: [PATCH 161/215] Added wayland-scanner build input to retroarch --- pkgs/applications/emulators/retroarch/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 581315d933b1..378f514c95eb 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -36,6 +36,7 @@ , udev , vulkan-loader , wayland +, wayland-scanner , wrapQtAppsHook , zlib }: @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ - lib.optional withWayland wayland ++ + lib.optionals withWayland [wayland wayland-scanner] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib dbus From a29c74343fabdce93cbe06e47fd89edf16c825e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:56:26 +0100 Subject: [PATCH 162/215] python312Packages.aiokafka: update disabled --- pkgs/development/python-modules/aiokafka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 085ad7eb2d10..131f0c041323 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "aio-libs"; From 357b7aabfee33c755a774d6c73006b22cb503cb4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 27 Oct 2024 09:00:40 +0100 Subject: [PATCH 163/215] postgresqlJitPackages.lantern: fix build The link_llvm_objects.sh script used a hardcoded /bin/bash shebang, which failed during a JIT-enabled build. --- pkgs/servers/sql/postgresql/ext/lantern.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 118c19699292..9f370c327cab 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + postPatch = '' + patchShebangs --build scripts/link_llvm_objects.sh + ''; + nativeBuildInputs = [ cmake ]; From 5780b4f957971c29958f69c38b055845c695b54c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 09:01:49 +0100 Subject: [PATCH 164/215] python312Packages.nexusformat: refactor - update ordering - fix changelog URL - remove superfluous comments --- .../python-modules/nexusformat/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 0c92f822f761..ae685948c3a0 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -2,31 +2,28 @@ lib, buildPythonPackage, fetchPypi, - - # build-system - setuptools, - setuptools-scm, - - # tests - pytestCheckHook, - - # dependencies h5py, hdf5plugin, numpy, + pytestCheckHook, + pythonOlder, scipy, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "nexusformat"; version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.10"; + src = fetchPypi { inherit pname version; hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM="; }; - pyproject = true; - build-system = [ setuptools setuptools-scm @@ -39,14 +36,14 @@ buildPythonPackage rec { scipy ]; - pythonImportsCheck = [ "nexusformat.nexus" ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "nexusformat.nexus" ]; + meta = with lib; { description = "Python API to open, create, and manipulate NeXus data written in the HDF5 format"; homepage = "https://github.com/nexpy/nexusformat"; - changelog = "https://github.com/nexpy/nexusformat/releases/tag/${version}"; + changelog = "https://github.com/nexpy/nexusformat/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ oberth-effect ]; }; From 29225a3106f80bbb4ba46aff03db73284547840b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 27 Oct 2024 09:02:44 +0100 Subject: [PATCH 165/215] postgresqlPackages.lantern: 0.3.3 -> 0.4.1 Changelog at: https://github.com/lanterndata/lantern/releases --- pkgs/servers/sql/postgresql/ext/lantern.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 9f370c327cab..f742d56f7077 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -9,18 +9,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "postgresql-lantern"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; rev = "v${finalAttrs.version}"; - hash = "sha256-aw003Y2T9/yNJ5dkCD+qQsUO2V7Q63I/E2IFaZAPd90="; + hash = "sha256-V8W61hELXeaVvNZgRUcckFlCMWis7NENlRKySxsK/L8="; fetchSubmodules = true; }; postPatch = '' - patchShebangs --build scripts/link_llvm_objects.sh + patchShebangs --build lantern_hnsw/scripts/link_llvm_objects.sh ''; nativeBuildInputs = [ @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_FOR_DISTRIBUTING=ON" + "-S ../lantern_hnsw" ]; passthru.tests.extension = stdenv.mkDerivation { From 8e48b5cc39c14fe8be764c960fc45df9eca5654a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 09:18:44 +0100 Subject: [PATCH 166/215] dnsmonster: refactor --- pkgs/tools/networking/dnsmonster/default.nix | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index 01121f001e55..782bd8518596 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, libpcap +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libpcap, }: buildGoModule rec { @@ -11,21 +12,19 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mosajjal"; - repo = pname; - rev = "v${version}"; + repo = "dnsmonster"; + rev = "refs/tags/v${version}"; hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM="; }; vendorHash = "sha256-QCG/rhs4Y3lLDVU15cBNUZqbKc4faNAqKMhMOFwK2SY="; - buildInputs = [ - libpcap - ]; + buildInputs = [ libpcap ]; ldflags = [ "-s" "-w" - "-X github.com/mosajjal/dnsmonster/util.releaseVersion=${version}" + "-X=github.com/mosajjal/dnsmonster/util.releaseVersion=${version}" ]; meta = with lib; { From c77dd94ccb8b3873505ef3d98dc9d3c6571f2d05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 07:28:18 +0000 Subject: [PATCH 167/215] terraform-providers.aiven: 4.27.0 -> 4.28.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2508babb9881..b8d3a999437a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-J/ZdlrYRo7Npr9zYZxvs0LWwqZN/r+IcgfOGMYaIqo4=", + "hash": "sha256-nWa9ohf3DOiMloJ5J8UcSZjJNHjRZw1sD6k5R8m6LWA=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.27.0", + "rev": "v4.28.0", "spdx": "MIT", - "vendorHash": "sha256-vlL4RLe89MZ3z5xyC3r3kI4RqWXwbqWNQZlOxxpsGZo=" + "vendorHash": "sha256-UM4EjL1qXOn2TMOupVxSyJVLarHIGTySXNJtWPrseSE=" }, "akamai": { "hash": "sha256-KnX+PAhT7TPp9SRkGwYPvxgk/ExaJPr7vKj9hTbJGhg=", From f7dea4207ff0e479268dbd3b29bb265414135fec Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Tue, 23 Jan 2024 22:34:49 +0100 Subject: [PATCH 168/215] vep: init at 110 Version number use Ensembl major version. --- pkgs/by-name/ve/vep/package.nix | 134 ++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 pkgs/by-name/ve/vep/package.nix diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix new file mode 100644 index 000000000000..576b4c9b35fb --- /dev/null +++ b/pkgs/by-name/ve/vep/package.nix @@ -0,0 +1,134 @@ +# Instructions:http://www.ensembl.org/info/docs/api/api_installation.html, +# Do not use https://github.com/Ensembl/ensembl-vep/archive/release/${version}.zip +# We cannot use INSTALL.pl but it’s not that bad:install the dependencies and copies the .pm files should be ok +{ + lib, + htslib, + perlPackages, + stdenv, + fetchFromGitHub, + perl, + makeWrapper, +}: + +let + version = "110"; + customInstallPhase = '' + mkdir -p $out/${perl.libPrefix}/${perl.version}/ + tests=$(find modules/ -mindepth 1 -maxdepth 1 -type d | grep -v t) + cp -r $tests $out/${perl.libPrefix}/${perl.version}/ + ''; + + ensemblGit = + name: sha256: + # Copy modules directly + stdenv.mkDerivation { + inherit name version; + src = fetchFromGitHub { + inherit sha256 version; + owner = "Ensembl"; + repo = name; + rev = "release/${version}"; + }; + installPhase = '' + runHook preInstall + + ${customInstallPhase} + + runHook postInstall''; + }; + + vepPlugins = fetchFromGitHub { + owner = "Ensembl"; + repo = "VEP_plugins"; + rev = "8f271c4848338dc7d504881ff71fdf2892c3d096"; + sha256 = "sha256-LbaXwLFDP3m1QhRHwO9uh36BEFHE2NzL4xdxTb7/S5Q="; + }; + + # Install ensembl-xs, faster run using re-implementation in C of some of the Perl subroutines + ensembl-xs = perlPackages.buildPerlPackage rec { + pname = "ensembl-xs"; + version = "2.3.2"; + src = fetchFromGitHub { + inherit version; + owner = "Ensembl"; + repo = "ensembl-xs"; + rev = version; + sha256 = "1qqnski532f4bz32wxbqd9w1sz40rjh81ipp9p02k3rlaf1gp1fa"; + }; + # PREFIX is important + configurePhase = '' + perl Makefile.PL PREFIX=$out INSTALLDIRS=site + ''; + # Test do not work -- wrong include path + doCheck = false; + }; + + # it contains compiled versions of certain key subroutines used in VEP + ensembl = ensemblGit "ensembl" "sha256-ZhI4VNxIY+53RX2uYRNlFeo/ydAmlwGx00WDXaxv6h4="; + ensembl-io = ensemblGit "ensembl-io" "sha256-r3RvN5U2kcyghoKM0XuiBRe54t1U4FaZ0QEeYIFiG0w="; + ensembl-variation = ensemblGit "ensembl-variation" "sha256-UjrLHF9EqI+Mp+SZR4sLNZUCGiA/UYhoFWtpwiKF8tM="; + ensembl-funcgen = ensemblGit "ensembl-funcgen" "sha256-a9hxLBoXJsF5JWuRdpyOac1u033M8ivEjEQecuncghs="; +in +perlPackages.buildPerlModule rec { + inherit version; + pname = "vep"; + buildInputs = + (with perlPackages; [ + ArchiveZip + BioBigFile + BioDBHTS + BioExtAlign + BioPerl + DBI + DBDmysql + LWP + JSON + ]) + ++ [ + ensembl-xs + ensembl + ensembl-funcgen + ensembl-io + ensembl-variation + ]; + propagatedBuildInputs = [ htslib ]; + src = fetchFromGitHub { + owner = "Ensembl"; + repo = "ensembl-${pname}"; + rev = "release/${version}"; + sha256 = "sha256-6lRdWV2ispl+mpBhkZez/d9PxOw1fkNUWeG8mUIqBJc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + doCheck = false; + + outputs = [ "out" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -D -m755 filter_vep vep $out/bin/ + + wrapProgram $out/bin/vep \ + --prefix PERL5LIB : $out/${perl.libPrefix}/${perl.version}/ \ + --add-flags "--dir_plugins ${vepPlugins}" + + wrapProgram $out/bin/filter_vep \ + --prefix PERL5LIB : $out/${perl.libPrefix}/${perl.version}/ + ${customInstallPhase} + + runHook postInstall + ''; + + meta = { + homepage = "https://www.ensembl.org/info/docs/tools/vep/index.html"; + description = "Annotate genetics variants based on genes, transcripts, and protein sequence, as well as regulatory regions"; + license = lib.licenses.asl20; + mainProgram = "vep"; + maintainers = with lib.maintainers; [ apraga ]; + platforms = lib.platforms.unix; + }; +} From edbe0026d341fab446ee2aa2abba7c6f440984c1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 27 Oct 2024 10:44:30 +0200 Subject: [PATCH 169/215] python312Packages.intake: 2.0.3 -> 2.0.7 Diff: https://github.com/intake/intake/compare/refs/tags/2.0.3...2.0.7 Changelog: https://github.com/intake/intake/blob/2.0.7/docs/source/changelog.rst --- pkgs/development/python-modules/intake/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 7ee914aca70f..f01195764762 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - appdirs, + platformdirs, bokeh, buildPythonPackage, dask, @@ -20,6 +20,7 @@ python-snappy, pythonOlder, pyyaml, + networkx, requests, setuptools, setuptools-scm, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "intake"; - version = "2.0.3"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; + hash = "sha256-F13jbAQP3G3cKeAegM1w/t32xyC0BgL9/67aIlzA4SE="; }; nativeBuildInputs = [ @@ -46,7 +47,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + platformdirs dask entrypoints fsspec @@ -54,6 +55,7 @@ buildPythonPackage rec { jinja2 pandas pyyaml + networkx ]; nativeCheckInputs = [ From f917315f55d81446a4b3039d16de53953aeebb21 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 09:57:43 +0100 Subject: [PATCH 170/215] lib60870: remove 'with lib' usage --- pkgs/by-name/li/lib60870/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 4669042b7be9..5e3c0da7c42a 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Implementation of the IEC 60870-5-101/104 protocol"; homepage = "https://libiec61850.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ stv0g ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ stv0g ]; + platforms = lib.platforms.unix; }; }) From a7bc20eede1da3f3bd01bb9b6e10abb2dca82f54 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 27 Oct 2024 10:56:19 +0200 Subject: [PATCH 171/215] python312Packages.intake: remove failing tests (conditionally) --- .../python-modules/intake/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index f01195764762..1422752b3230 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -19,6 +19,7 @@ pytestCheckHook, python-snappy, pythonOlder, + pythonAtLeast, pyyaml, networkx, requests, @@ -126,12 +127,18 @@ buildPythonPackage rec { # Timing-based, flaky on darwin and possibly others "test_idle_timer" ] - ++ lib.optionals - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") - [ - # Flaky with older low-res mtime on darwin < 10.13 (#143987) - "test_second_load_timestamp" - ]; + ++ lib.optionals (pythonAtLeast "3.12") [ + # Require deprecated distutils + "test_which" + "test_load" + ] + ++ + lib.optionals + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") + [ + # Flaky with older low-res mtime on darwin < 10.13 (#143987) + "test_second_load_timestamp" + ]; pythonImportsCheck = [ "intake" ]; From bb18a45836c953f47a3db273eb289e6370511caf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 15 May 2023 15:21:23 +0300 Subject: [PATCH 172/215] python311Packages.toptica-lasersdk: init at 3.2.0 --- .../toptica-lasersdk/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/toptica-lasersdk/default.nix diff --git a/pkgs/development/python-modules/toptica-lasersdk/default.nix b/pkgs/development/python-modules/toptica-lasersdk/default.nix new file mode 100644 index 000000000000..6c7ccb9c252e --- /dev/null +++ b/pkgs/development/python-modules/toptica-lasersdk/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + ifaddr, + pyserial, +}: + +buildPythonPackage rec { + pname = "toptica-lasersdk"; + version = "3.2.0"; + pyproject = true; + + src = fetchPypi { + pname = "toptica_lasersdk"; + inherit version; + hash = "sha256-UNazng4Za3CZeG7eDq0b+l7gmESEXIU8WMLWGGysmBg="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + ifaddr + pyserial + ]; + + pythonImportsCheck = [ + "toptica.lasersdk.dlcpro.v2_2_0" + ]; + + meta = { + description = "TOPTICA Python Laser SDK"; + homepage = "https://toptica.github.io/python-lasersdk/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9381870a0cd..1b26b761dc37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15770,6 +15770,8 @@ self: super: with self; { toposort = callPackage ../development/python-modules/toposort { }; + toptica-lasersdk = callPackage ../development/python-modules/toptica-lasersdk { }; + torch = callPackage ../development/python-modules/torch { }; # Required to test triton From c37476fe39f94c3397b1678fab82a73187b0b86e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 10:07:00 +0100 Subject: [PATCH 173/215] lib61850: remove 'with lib' usage --- pkgs/by-name/li/libiec61850/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libiec61850/package.nix b/pkgs/by-name/li/libiec61850/package.nix index 03c8037d6b33..94261d06dfdb 100644 --- a/pkgs/by-name/li/libiec61850/package.nix +++ b/pkgs/by-name/li/libiec61850/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Open-source library for the IEC 61850 protocols"; homepage = "https://libiec61850.com/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ stv0g ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ stv0g ]; + platforms = lib.platforms.unix; }; }) From 5b5e9be6abe8f61ff6bfe8f70b7160aad8a209f6 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 26 Oct 2024 19:15:53 +0300 Subject: [PATCH 174/215] gtkgreet: fix cross-compilation Signed-off-by: Alexander V. Nikolaev --- pkgs/applications/display-managers/greetd/gtkgreet.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix index 10389c262742..652459e9715e 100644 --- a/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -24,11 +24,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8="; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja cmake + scdoc wrapGAppsHook3 ]; @@ -36,7 +38,6 @@ stdenv.mkDerivation rec { gtk3 gtk-layer-shell json_c - scdoc librsvg ]; @@ -44,6 +45,11 @@ stdenv.mkDerivation rec { "-Dlayershell=enabled" ]; + postPatch = '' + substituteInPlace meson.build \ + --replace "dependency('scdoc'," "dependency('scdoc', native:true," + ''; + # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; From 95798647f17fc4588c686abe2562e84b90d886a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 07:22:32 +0000 Subject: [PATCH 175/215] terraform-providers.gridscale: 1.26.0 -> 1.27.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b8d3a999437a..14efee377138 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,11 +525,11 @@ "vendorHash": "sha256-jAYaVNWMEGLDPgnyD2VJwVpDwn9lcvBNLnKPdlqdRZc=" }, "gridscale": { - "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", + "hash": "sha256-J4ZLexpjYXxOTaqih0+Nucyf2soYXxGiB38xAeXUJKs=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.26.0", + "rev": "v1.27.0", "spdx": "MPL-2.0", "vendorHash": null }, From f5d1d1ddfd258be4ed4d8d93ff78001cecf4fc53 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sun, 27 Oct 2024 05:54:56 +0000 Subject: [PATCH 176/215] dry: init at 0.11.2 --- pkgs/by-name/dr/dry/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/dr/dry/package.nix diff --git a/pkgs/by-name/dr/dry/package.nix b/pkgs/by-name/dr/dry/package.nix new file mode 100644 index 000000000000..d92189012dc1 --- /dev/null +++ b/pkgs/by-name/dr/dry/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "dry"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "moncho"; + repo = "dry"; + rev = "v${version}"; + hash = "sha256-JGtPX6BrB3q2EQyF6x2A5Wsn5DudOSVt3IxBAjjwlC8="; + }; + + proxyVendor = true; + vendorHash = "sha256-AduDbBpCoW7GmYrBPpL7wyLvwoez81qP/+mllgoHInY="; + + meta = { + description = "Terminal application to manage Docker and Docker Swarm"; + homepage = "https://moncho.github.io/dry/"; + changelog = "https://github.com/moncho/dry/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dump_stack ]; + mainProgram = "dry"; + }; +} From 205cba23e860aaed551d411ae1310de718c95b40 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 10:44:28 +0100 Subject: [PATCH 177/215] hello: adopt package by stv0g --- pkgs/by-name/he/hello/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index 659899bd5f9b..eea9dd6a715c 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/hello/manual/"; changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ stv0g ]; mainProgram = "hello"; platforms = platforms.all; }; From 509e3f26820f67082319a8a8340adc2bd7ad54ca Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 10:45:05 +0100 Subject: [PATCH 178/215] hello: format with nixfmt according to RFC166 --- pkgs/by-name/he/hello/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index eea9dd6a715c..adf4b8a5f3bd 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -1,11 +1,12 @@ -{ callPackage -, lib -, stdenv -, fetchurl -, nixos -, testers -, versionCheckHook -, hello +{ + callPackage, + lib, + stdenv, + fetchurl, + nixos, + testers, + versionCheckHook, + hello, }: stdenv.mkDerivation (finalAttrs: { From 4b599937a6287eb96f6a4eef1fdb8273b96e6446 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 10:45:30 +0100 Subject: [PATCH 179/215] hello: remove 'with lib' usage --- pkgs/by-name/he/hello/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index adf4b8a5f3bd..2463ce5ad6c4 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; - meta = with lib; { + meta = { description = "Program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. @@ -44,9 +44,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.gnu.org/software/hello/manual/"; changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ stv0g ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ stv0g ]; mainProgram = "hello"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) From bdccc092c4fe51c88bb268826d96dff0945fec6a Mon Sep 17 00:00:00 2001 From: Ronja Schwarz <71409721+wilhelmines@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:40:08 +0200 Subject: [PATCH 180/215] maintainers: add wilhelmines --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba6458af23e0..83c556be90f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23072,6 +23072,13 @@ githubId = 1215623; keys = [ { fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; } ]; }; + wilhelmines = { + email = "mail@aesz.org"; + matrix = "@wilhelmines:matrix.org"; + name = "Ronja Schwarz"; + github = "wilhelmines"; + githubId = 71409721; + }; willbush = { email = "git@willbush.dev"; matrix = "@willbush:matrix.org"; From caad3ec5306768a02cb4413b2dcbe4599af62d84 Mon Sep 17 00:00:00 2001 From: Ronja Schwarz <71409721+wilhelmines@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:48:51 +0200 Subject: [PATCH 181/215] versatiles: init at 0.12.10 versatiles: adding changelog link versatiles: added recommended changes versatiles: Changed description --- pkgs/by-name/ve/versatiles/package.nix | 51 ++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/ve/versatiles/package.nix diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix new file mode 100644 index 000000000000..7f960aa06ce4 --- /dev/null +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "versatiles"; + version = "0.12.10"; # When updating: Replace with current version + + src = fetchFromGitHub { + owner = "versatiles-org"; + repo = "versatiles-rs"; + rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version + hash = "sha256-LKUpxsAy39dX8hESlUEVs4rkOpYsd7kbATfnU1QYd9Q="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + }; + + cargoHash = "sha256-dkFnoQY1+VNNrjS+o5Y0cvhWKoHt38KJKyNhCQ0dGaY="; # When updating: Same as above + + # Testing only necessary for the `bins` and `lib` features + cargoTestFlags = [ + "--bins" + "--lib" + ]; + + # Skip tests that require network access + checkFlags = [ + "--skip tools::convert::tests::test_remote1" + "--skip tools::convert::tests::test_remote2" + "--skip tools::probe::tests::test_remote" + "--skip tools::serve::tests::test_remote" + "--skip utils::io::data_reader_http" + "--skip utils::io::data_reader_http::tests::read_range_git" + "--skip utils::io::data_reader_http::tests::read_range_googleapis" + ]; + + meta = { + description = "Toolbox for converting, checking and serving map tiles in various formats"; + longDescription = '' + VersaTiles is a Rust-based project designed for processing and serving tile data efficiently. + It supports multiple tile formats and offers various functionalities for handling tile data. + ''; + homepage = "https://versatiles.org/"; + downloadPage = "https://github.com/versatiles-org/versatiles-rs"; + changelog = "https://github.com/versatiles-org/versatiles-rs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wilhelmines ]; + mainProgram = "versatiles"; + platforms = with lib.platforms; linux ++ darwin ++ windows; + }; +} From 1bcee5ac7d8d9f502d3a3d51b9c060da6a7e63ab Mon Sep 17 00:00:00 2001 From: Patka Date: Sun, 27 Oct 2024 10:57:03 +0100 Subject: [PATCH 182/215] rainfrog: 0.2.7 -> 0.2.9 release notes: https://github.com/achristmascarl/rainfrog/releases/tag/v0.2.9 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index ffc47f38de8f..4f9b3b56239f 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ stdenv, }: let - version = "0.2.7"; + version = "0.2.9"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; rev = "refs/tags/v${version}"; - hash = "sha256-ey9ioPDeuNYw2+UBUgtE0C1wES3wecFDWd9CMeKBq4Q="; + hash = "sha256-PiJRVf+rpYFWRmys7Ca2lLfe5F9/ksIzkpKs6CQWu+A="; }; - cargoHash = "sha256-mc7Lgaf1seefVu+LafctJm4y8xjX3c1ApadeQMi3STE="; + cargoHash = "sha256-L0gXxV/3+5oRV/Ipm4sRqr9dh9AEChWhtILO3PaNxYY="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From c5ac704185148368553d1a053ad80cc6b7d9cf2e Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 27 Oct 2024 11:00:30 +0100 Subject: [PATCH 183/215] assh: remove zzamboni from maintainers --- pkgs/tools/networking/assh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 43ed2dc16c8a..96672515e4d3 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -43,7 +43,7 @@ buildGoModule rec { homepage = "https://github.com/moul/assh"; changelog = "https://github.com/moul/assh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ zzamboni ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; }; } From 7bbd97e291d8dc66dd4004655adb8b3e08863bb8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 27 Oct 2024 11:00:41 +0100 Subject: [PATCH 184/215] maintainers: remove zzamboni --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d959e70c68c..62981d6d4066 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24256,12 +24256,6 @@ githubId = 71881325; name = "Stefan Bordei"; }; - zzamboni = { - email = "diego@zzamboni.org"; - github = "zzamboni"; - githubId = 32876; - name = "Diego Zamboni"; - }; zzzsy = { email = "me@zzzsy.top"; github = "zzzsyyy"; From af9e3bb5abf3ac351d3b96fd9dd745e7d784dbd3 Mon Sep 17 00:00:00 2001 From: Joonas Rautiola Date: Sat, 26 Oct 2024 19:54:05 +0300 Subject: [PATCH 185/215] sshified: init at 1.2.1 --- pkgs/by-name/ss/sshified/package.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ss/sshified/package.nix diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix new file mode 100644 index 000000000000..56498841a3d6 --- /dev/null +++ b/pkgs/by-name/ss/sshified/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "sshified"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "hoffie"; + repo = "sshified"; + rev = "refs/tags/v${version}"; + hash = "sha256-oCeuQ4Do+Lyqsf8hBH9qvLxWbWQlqol481VrbnAW2ic="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; + + subPackages = [ "." ]; + + meta = { + description = "Proxy HTTP requests through SSH"; + homepage = "https://github.com/hoffie/sshified"; + changelog = "https://github.com/hoffie/sshified/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ joinemm ]; + mainProgram = "sshified"; + }; +} From 7d263a7cbb2cd62a0bac28af8a097d3df1f5b4cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 10:09:32 +0000 Subject: [PATCH 186/215] victoriametrics: 1.102.1 -> 1.105.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 3ded9852fff5..8f265415b300 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.102.1"; + version = "1.105.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-FFQiHPcvB3ht6NlaUWPAuEUswXYUzeRilAw4NQ9+8/o="; + hash = "sha256-cMc2CVjVTQLsY/GJht35DCapEtROPJO3j6FCCDXJPMk="; }; vendorHash = null; From 37a04b8c02b4a0890312f1c76e8d77877b9512fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 10:10:47 +0000 Subject: [PATCH 187/215] python312Packages.python-linkplay: 0.0.15 -> 0.0.16 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 7a0cc917a6bc..696c750e76e1 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-PDkDZchAXxrmjg7G/dbbUyZUS8dNrOppH96mLLdwK1s="; + hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk="; }; build-system = [ setuptools ]; From 1eaa723200b97fe2738336c939c911ef924dd482 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 11:12:01 +0100 Subject: [PATCH 188/215] libconfig: adopt package by stv0g --- pkgs/development/libraries/libconfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 049b0c8f4fb8..0c828a38a694 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://www.hyperrealm.com/libconfig"; description = "Simple library for processing structured configuration files"; license = licenses.lgpl3; - maintainers = [ ]; + maintainers = with maintainers; [ stv0g ]; platforms = platforms.all; }; } From 0638964f290cf1f36b599c27239196f65e3bd9fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 10:15:23 +0000 Subject: [PATCH 189/215] trufflehog: 3.82.12 -> 3.82.13 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index d1f7465c02f3..3d4824d77135 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.82.12"; + version = "3.82.13"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-eTZ+Bee9t0cf9uaG+Cwvq+sWalQt2IhrM6eGhs90GIk="; + hash = "sha256-QAo6BvkqG0EklyKLRMExNv+AZZeuTELYY0FdP8LDbZs="; }; - vendorHash = "sha256-MexqvYRGBHEVED3y0hWGGTwxRFI/LfyYE2IFLqChgWE="; + vendorHash = "sha256-P/Kt/ZLdjiULcRIXRVfUT9nkDGpl46VHRkeqt0mwaWc="; proxyVendor = true; From 438a62e1beaeda3d93a472278175b5fafec84641 Mon Sep 17 00:00:00 2001 From: LoC Date: Sat, 26 Oct 2024 21:20:44 +0200 Subject: [PATCH 190/215] ytdl-sub: init at 2024.10.26 --- pkgs/by-name/yt/ytdl-sub/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/yt/ytdl-sub/package.nix diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix new file mode 100644 index 000000000000..71a0ee253521 --- /dev/null +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -0,0 +1,49 @@ +{ + python3Packages, + fetchPypi, + ffmpeg, + lib, +}: +python3Packages.buildPythonApplication rec { + pname = "ytdl-sub"; + version = "2024.10.26"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "ytdl_sub"; + hash = "sha256-qfEPHhCB/Avl+nUIk2+ZVseg8ATP/LQmLvX/H9rhp7M="; + }; + + build-system = with python3Packages; [ + setuptools + wheel + ]; + + dependencies = with python3Packages; [ + yt-dlp + colorama + mergedeep + mediafile + pyyaml + ]; + + makeWrapperArgs = [ + "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg "ffmpeg"}" + "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}" + ]; + + meta = { + homepage = "https://github.com/jmbannon/ytdl-sub"; + description = "Lightweight tool to automate downloading and metadata generation with yt-dlp"; + longDescription = '' + ytdl-sub is a command-line tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. No additional plugins or external scrapers are needed. + ''; + changelog = "https://github.com/jmbannon/ytdl-sub/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + loc + ]; + mainProgram = "ytdl-sub"; + }; +} From c6da9ef32d63db850220e67dd52564aca6f470c9 Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 10 Sep 2024 19:14:43 +0200 Subject: [PATCH 191/215] modules/virtualisation: add unified diskSize opt See https://github.com/NixOS/nixpkgs/pull/339535 and https://github.com/NixOS/nixpkgs/pull/341058 --- .../maintainers/scripts/ec2/amazon-image.nix | 34 +++++++++++------ .../scripts/openstack/openstack-image-zfs.nix | 27 +++++++++---- nixos/modules/virtualisation/azure-image.nix | 29 ++++++++------ .../virtualisation/digital-ocean-image.nix | 29 ++++++++------ .../virtualisation/disk-size-option.nix | 38 +++++++++++++++++++ .../virtualisation/google-compute-image.nix | 28 ++++++++------ nixos/modules/virtualisation/hyperv-image.nix | 31 ++++++++++----- nixos/modules/virtualisation/linode-image.nix | 27 ++++++++----- nixos/modules/virtualisation/oci-image.nix | 7 +++- nixos/modules/virtualisation/oci-options.nix | 23 +++++++---- .../modules/virtualisation/proxmox-image.nix | 30 +++++++++------ nixos/modules/virtualisation/qemu-vm.nix | 13 ++----- .../virtualisation/virtualbox-image.nix | 30 +++++++++------ nixos/release.nix | 2 +- 14 files changed, 231 insertions(+), 117 deletions(-) create mode 100644 nixos/modules/virtualisation/disk-size-option.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 9d0e7f5883e0..e08cf572f7f9 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -15,11 +15,23 @@ let inherit (lib.options) literalExpression; cfg = config.amazonImage; amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; - in { - - imports = [ ../../../modules/virtualisation/amazon-image.nix ]; + imports = [ + ../../../modules/virtualisation/amazon-image.nix + ../../../modules/virtualisation/disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "amazonImage" + "sizeMB" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; # Amazon recommends setting this to the highest possible value for a good EBS # experience, which prior to 4.15 was 255. @@ -52,13 +64,6 @@ in ''; }; - sizeMB = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = 3072; - example = 8192; - description = "The size in MB of the image"; - }; - format = mkOption { type = types.enum [ "raw" @@ -70,6 +75,11 @@ in }; }; + # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault + # to avoid breaking existing configs using that. + config.virtualisation.diskSize = lib.mkOverride 1490 (3 * 1024); + config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable; + config.system.build.amazonImage = let configFile = pkgs.writeText "configuration.nix" '' @@ -98,7 +108,7 @@ in bootSize = 1000; # 1G is the minimum EBS volume - rootSize = cfg.sizeMB; + rootSize = config.virtualisation.diskSize; rootPoolProperties = { ashift = 12; autoexpand = "on"; @@ -151,7 +161,7 @@ in fsType = "ext4"; partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; - diskSize = cfg.sizeMB; + inherit (config.virtualisation) diskSize; postVM = '' extension=''${diskImage##*.} diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 72f123b16229..57022bd2f784 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -15,6 +15,18 @@ in { imports = [ ../../../modules/virtualisation/openstack-config.nix + ../../../modules/virtualisation/disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "openstackImage" + "sizeMB" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); options.openstackImage = { @@ -26,16 +38,10 @@ in ramMB = mkOption { type = types.int; - default = 1024; + default = (3 * 1024); description = "RAM allocation for build VM"; }; - sizeMB = mkOption { - type = types.int; - default = 8192; - description = "The size in MB of the image"; - }; - format = mkOption { type = types.enum [ "raw" @@ -61,6 +67,11 @@ in }; }; + # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault + # to avoid breaking existing configs using that. + virtualisation.diskSize = lib.mkOverride 1490 (8 * 1024); + virtualisation.diskSizeAutoSupported = false; + system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix { inherit lib config; inherit (cfg) contents format name; @@ -77,7 +88,7 @@ in bootSize = 1000; memSize = cfg.ramMB; - rootSize = cfg.sizeMB; + rootSize = config.virtualisation.diskSize; rootPoolProperties = { ashift = 12; autoexpand = "on"; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 1f6b2bd52c04..76d8a3bb365b 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -10,18 +10,24 @@ let cfg = config.virtualisation.azureImage; in { - imports = [ ./azure-common.nix ]; + imports = [ + ./azure-common.nix + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "virtualisation" + "azureImage" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; options.virtualisation.azureImage = { - diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; - description = '' - Size of disk image. Unit is MB. - ''; - }; - bootSize = mkOption { type = types.int; default = 256; @@ -67,7 +73,8 @@ in bootSize = "${toString cfg.bootSize}M"; partitionTableType = if cfg.vmGeneration == "v2" then "efi" else "legacy"; - inherit (cfg) diskSize contents; + inherit (cfg) contents; + inherit (config.virtualisation) diskSize; inherit config lib pkgs; }; }; diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix index 2d06c4c38fa1..b6ef01516e34 100644 --- a/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/nixos/modules/virtualisation/digital-ocean-image.nix @@ -11,18 +11,24 @@ let in { - imports = [ ./digital-ocean-config.nix ]; + imports = [ + ./digital-ocean-config.nix + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "virtualisation" + "digitalOceanImage" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; options = { - virtualisation.digitalOceanImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 4096; - description = '' - Size of disk image. Unit is MB. - ''; - }; - virtualisation.digitalOceanImage.configFile = mkOption { type = with types; nullOr path; default = null; @@ -52,7 +58,6 @@ in #### implementation config = { - system.build.digitalOceanImage = import ../../lib/make-disk-image.nix { name = "digital-ocean-image"; format = "qcow2"; @@ -73,7 +78,7 @@ in config.virtualisation.digitalOcean.defaultConfigFile else cfg.configFile; - inherit (cfg) diskSize; + inherit (config.virtualisation) diskSize; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/disk-size-option.nix b/nixos/modules/virtualisation/disk-size-option.nix new file mode 100644 index 000000000000..487c3adfe2b7 --- /dev/null +++ b/nixos/modules/virtualisation/disk-size-option.nix @@ -0,0 +1,38 @@ +{ lib, config, ... }: +let + t = lib.types; +in +{ + options = { + virtualisation.diskSizeAutoSupported = lib.mkOption { + type = t.bool; + default = true; + description = '' + Whether the current image builder or vm runner supports `virtualisation.diskSize = "auto".` + ''; + internal = true; + }; + + virtualisation.diskSize = lib.mkOption { + type = t.either (t.enum [ "auto" ]) t.ints.positive; + default = if config.virtualisation.diskSizeAutoSupported then "auto" else 1024; + defaultText = "\"auto\" if diskSizeAutoSupported, else 1024"; + description = '' + The disk size in megabytes of the virtual machine. + ''; + }; + }; + + config = + let + inherit (config.virtualisation) diskSize diskSizeAutoSupported; + in + { + assertions = [ + { + assertion = diskSize != "auto" || diskSizeAutoSupported; + message = "Setting virtualisation.diskSize to `auto` is not supported by the current image build or vm runner; use an explicit size."; + } + ]; + }; +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 416b47b768d9..c2529bb3db3f 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -19,18 +19,24 @@ let in { - imports = [ ./google-compute-config.nix ]; + imports = [ + ./google-compute-config.nix + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "virtualisation" + "googleComputeImage" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; options = { - virtualisation.googleComputeImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 1536; - description = '' - Size of disk image. Unit is MB. - ''; - }; - virtualisation.googleComputeImage.configFile = mkOption { type = with types; nullOr str; default = null; @@ -86,7 +92,7 @@ in format = "raw"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; partitionTableType = if cfg.efi then "efi" else "legacy"; - inherit (cfg) diskSize; + inherit (config.virtualisation) diskSize; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index d4ed256d0d91..ea0603fa6ae5 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -9,19 +9,26 @@ with lib; let cfg = config.hyperv; - in { + + imports = [ + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "hyperv" + "baseImageSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; + options = { hyperv = { - baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; - description = '' - The size of the hyper-v base image in MiB. - ''; - }; vmDerivationName = mkOption { type = types.str; default = "nixos-hyperv-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; @@ -40,6 +47,10 @@ in }; config = { + # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault + # to avoid breaking existing configs using that. + virtualisation.diskSize = lib.mkOverride 1490 (4 * 1024); + system.build.hypervImage = import ../../lib/make-disk-image.nix { name = cfg.vmDerivationName; postVM = '' @@ -47,7 +58,7 @@ in rm $diskImage ''; format = "raw"; - diskSize = cfg.baseImageSize; + inherit (config.virtualisation) diskSize; partitionTableType = "efi"; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix index 48d7f98e6abe..ff61c5f5d1db 100644 --- a/nixos/modules/virtualisation/linode-image.nix +++ b/nixos/modules/virtualisation/linode-image.nix @@ -17,17 +17,24 @@ let ''; in { - imports = [ ./linode-config.nix ]; + imports = [ + ./linode-config.nix + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "virtualisation" + "linodeImage" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; options = { - virtualisation.linodeImage.diskSize = mkOption { - type = with types; either (enum (singleton "auto")) ints.positive; - default = "auto"; - example = 1536; - description = '' - Size of disk image in MB. - ''; - }; virtualisation.linodeImage.configFile = mkOption { type = with types; nullOr str; @@ -62,7 +69,7 @@ in format = "raw"; partitionTableType = "none"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; - inherit (cfg) diskSize; + inherit (config.virtualisation) diskSize; inherit config lib pkgs; }; }; diff --git a/nixos/modules/virtualisation/oci-image.nix b/nixos/modules/virtualisation/oci-image.nix index b867e7ae30e7..fe286853de81 100644 --- a/nixos/modules/virtualisation/oci-image.nix +++ b/nixos/modules/virtualisation/oci-image.nix @@ -12,9 +12,14 @@ in imports = [ ./oci-common.nix ]; config = { + # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault + # to avoid breaking existing configs using that. + virtualisation.diskSize = lib.mkOverride 1490 (8 * 1024); + virtualisation.diskSizeAutoSupported = false; + system.build.OCIImage = import ../../lib/make-disk-image.nix { inherit config lib pkgs; - inherit (cfg) diskSize; + inherit (config.virtualisation) diskSize; name = "oci-image"; configFile = ./oci-config-user.nix; format = "qcow2"; diff --git a/nixos/modules/virtualisation/oci-options.nix b/nixos/modules/virtualisation/oci-options.nix index 629b651ca5ac..b8d66c0290b3 100644 --- a/nixos/modules/virtualisation/oci-options.nix +++ b/nixos/modules/virtualisation/oci-options.nix @@ -1,10 +1,23 @@ { - config, lib, - pkgs, ... }: { + imports = [ + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "oci" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; + options = { oci = { efi = lib.mkOption { @@ -14,12 +27,6 @@ Whether the OCI instance is using EFI. ''; }; - diskSize = lib.mkOption { - type = lib.types.int; - default = 8192; - description = "Size of the disk image created in MB."; - example = "diskSize = 12 * 1024; # 12GiB"; - }; }; }; } diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 4364fbff2a83..9bbe7a596f07 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -6,8 +6,23 @@ }: with lib; - { + imports = [ + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "proxmox" + "qemuConf" + "diskSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; + options.proxmox = { qemuConf = { # essential configs @@ -95,16 +110,6 @@ with lib; either "efi" or "hybrid". ''; }; - diskSize = mkOption { - type = types.str; - default = "auto"; - example = "20480"; - description = '' - The size of the disk, in megabytes. - if "auto" size is calculated based on the contents copied to it and - additionalSpace is taken into account. - ''; - }; net0 = mkOption { type = types.commas; default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1"; @@ -305,7 +310,8 @@ with lib; mkdir -p $out/nix-support echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products ''; - inherit (cfg.qemuConf) additionalSpace diskSize bootSize; + inherit (cfg.qemuConf) additionalSpace bootSize; + inherit (config.virtualisation) diskSize; format = "raw"; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index fe803c1971ca..af2f13b003a4 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -317,12 +317,11 @@ let copyChannel = false; OVMF = cfg.efi.OVMF; }; - in - { imports = [ ../profiles/qemu-guest.nix + ./disk-size-option.nix (mkRenamedOptionModule [ "virtualisation" @@ -378,14 +377,6 @@ in ''; }; - virtualisation.diskSize = mkOption { - type = types.ints.positive; - default = 1024; - description = '' - The disk size in megabytes of the virtual machine. - ''; - }; - virtualisation.diskImage = mkOption { type = types.nullOr types.str; default = "./${config.system.name}.qcow2"; @@ -1250,6 +1241,8 @@ in # override by setting `virtualisation.fileSystems = lib.mkForce { };`. fileSystems = lib.mkIf (cfg.fileSystems != { }) (mkVMOverride cfg.fileSystems); + virtualisation.diskSizeAutoSupported = false; + virtualisation.fileSystems = let mkSharedDir = tag: share: { diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 968f5b766e87..22646011d33d 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -7,22 +7,27 @@ let cfg = config.virtualbox; - in { + imports = [ + ./disk-size-option.nix + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2411; + from = [ + "virtualbox" + "baseImageSize" + ]; + to = [ + "virtualisation" + "diskSize" + ]; + }) + ]; options = { virtualbox = { - baseImageSize = lib.mkOption { - type = with lib.types; either (enum [ "auto" ]) int; - default = "auto"; - example = 50 * 1024; - description = '' - The size of the VirtualBox base image in MiB. - ''; - }; baseImageFreeSpace = lib.mkOption { - type = with lib.types; int; + type = lib.types.int; default = 30 * 1024; description = '' Free space in the VirtualBox base image in MiB. @@ -180,6 +185,9 @@ in }; config = { + # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault + # to avoid breaking existing configs using that. + virtualisation.diskSize = lib.mkOverride 1490 (50 * 1024); virtualbox.params = lib.mkMerge [ (lib.mapAttrs (name: lib.mkDefault) { @@ -204,7 +212,7 @@ in inherit pkgs lib config; partitionTableType = "legacy"; - diskSize = cfg.baseImageSize; + inherit (config.virtualisation) diskSize; additionalSpace = "${toString cfg.baseImageFreeSpace}M"; postVM = '' diff --git a/nixos/release.nix b/nixos/release.nix index 8a8c45f8f842..f77b9983e496 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -312,7 +312,7 @@ in rec { [ configuration versionModule ./maintainers/scripts/ec2/amazon-image.nix - ({ ... }: { amazonImage.sizeMB = "auto"; }) + ({ ... }: { amazonImage.virtualisation.diskSize = "auto"; }) ]; }).config.system.build.amazonImage) From e26aa50bfcee70ef93f3eb373c99397d126786cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 11:30:13 +0000 Subject: [PATCH 192/215] crystal-dock: 2.5 -> 2.7 --- pkgs/by-name/cr/crystal-dock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix index fe1f4eaf11c9..dfd059d6d7e0 100644 --- a/pkgs/by-name/cr/crystal-dock/package.nix +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crystal-dock"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "dangvd"; repo = "crystal-dock"; rev = "v${finalAttrs.version}"; - hash = "sha256-y7Wt0o57z8NaAcYoaigWtI7twx8UAUgSIEWz86LcNKM="; + hash = "sha256-VxdVB/DLVvmHGvZ2JI/mZCCWIdopYhObJuN4MKh+l4A="; }; nativeBuildInputs = [ From 5751539661ae7b73415474ebea16932cb72dab54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 11:40:20 +0000 Subject: [PATCH 193/215] crystalline: 0.14.1 -> 0.15.0 --- .../tools/language-servers/crystalline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index 6ffb002ca7a7..3f59e57bdb01 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.14.1"; + version = "0.15.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-Z5gEuyK3MeFaIuzr+SdZ6dphSGEqL4fQ+cOwDW1Y3go="; + hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M="; }; format = "crystal"; From e027779498ce3f44b80817ace4ade60f3b2251d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 12:51:29 +0100 Subject: [PATCH 194/215] python312Packages.python-linkplay: remove relaxing of aiofiles --- pkgs/development/python-modules/python-linkplay/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 696c750e76e1..3efb6a31b201 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - pythonRelaxDeps = [ "aiofiles" ]; - dependencies = [ aiofiles aiohttp From dc9eb760396d9ec5a8c88ad1a23c569fe12b8cc7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 25 Oct 2024 21:17:46 +0200 Subject: [PATCH 195/215] libieee1284: fix building for non-x86 musl --- pkgs/development/libraries/libieee1284/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index c49e42523137..377d56957123 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-python" + ] ++ lib.optionals (stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isx86) [ + # musl always provides , even though the functionality + # is x86-specific. + # https://www.openwall.com/lists/musl/2024/10/25/2 + "ac_cv_header_sys_io_h=no" ]; prePatch = '' From bc1bc1aa3396c87fe6a78d56c1bf7534c71836c4 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Sat, 26 Oct 2024 21:09:39 +0100 Subject: [PATCH 196/215] graalvm-ce: fix native-image standalone usage by wrapping Nix env variables Closes #350909. --- .../community-edition/buildGraalvm.nix | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index d360da5dfa6c..f5b18d196ff5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -120,27 +120,44 @@ let xorg.libXtst ]; - postInstall = '' - # jni.h expects jni_md.h to be in the header search path. - ln -sf $out/include/linux/*_md.h $out/include/ + postInstall = + let + cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); + preservedNixVariables = [ + "-ELOCALE_ARCHIVE" + "-ENIX_BINTOOLS" + "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_BUILD_CORES" + "-ENIX_BUILD_TOP" + "-ENIX_CC" + "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_CFLAGS_COMPILE" + "-ENIX_HARDENING_ENABLE" + "-ENIX_LDFLAGS" + ]; + preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); + in + '' + # jni.h expects jni_md.h to be in the header search path. + ln -sf $out/include/linux/*_md.h $out/include/ - mkdir -p $out/share - # move files in $out like LICENSE.txt - find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; - # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt - rm -f $out/LICENSE_NATIVEIMAGE.txt + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook << EOF + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF - wrapProgram $out/bin/native-image \ - --prefix PATH : ${binPath} \ - ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} - ''; + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)} + ''; preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do @@ -171,10 +188,8 @@ let echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)" - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux From 80e7a05eedbfe66a93b70352eccb718837b0bbd5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 27 Oct 2024 12:21:28 +0000 Subject: [PATCH 197/215] buildGraalvmNativeImage: remove workaround for Nix environment variables --- pkgs/build-support/build-graalvm-native-image/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 0ac84b000575..d2f3aef8860c 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ({ buildPhase = args.buildPhase or '' runHook preBuild - native-image -jar "$jar" $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n) ''${nativeImageBuildArgs[@]} + native-image -jar "$jar" ''${nativeImageBuildArgs[@]} runHook postBuild ''; From c9414dab1376f81a60680ac4cc41768612b5b2bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 12:47:49 +0000 Subject: [PATCH 198/215] fflogs: 8.14.0 -> 8.14.21 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 2a398506b3d8..b4c94e54e303 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.14.0"; + version = "8.14.21"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-hHgPtr25X2vZY+MKQn9FgkMLrF5vgklMQHzx4ksGrDk="; + hash = "sha256-sBC2qvtSje2uXzSZAYXBFmycKxf0B6/JZhOvWNyMp20="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From 3d8be32059054d0763d32efdd5e0a58b25922f60 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 11:12:17 +0100 Subject: [PATCH 199/215] libconfig: refactor derivation --- .../libraries/libconfig/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 0c828a38a694..f0cc94171531 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -1,32 +1,34 @@ -{ lib -, stdenv -, fetchurl -, # this also disables building tests. +{ + lib, + stdenv, + fetchurl, + # This also disables building tests. # on static windows cross-compile they fail to build - doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic) + doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic), }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libconfig"; version = "1.7.3"; src = fetchurl { - url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; + url = "https://hyperrealm.github.io/${finalAttrs.pname}/dist/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; inherit doCheck; - configureFlags = lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples" - ++ lib.optional (!doCheck) "--disable-tests"; + configureFlags = + lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples" + ++ lib.optional (!finalAttrs.doCheck) "--disable-tests"; - cmakeFlags = lib.optionals (!doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ]; + cmakeFlags = lib.optionals (!finalAttrs.doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ]; - meta = with lib; { - homepage = "http://www.hyperrealm.com/libconfig"; - description = "Simple library for processing structured configuration files"; - license = licenses.lgpl3; - maintainers = with maintainers; [ stv0g ]; - platforms = platforms.all; + meta = { + homepage = "https://hyperrealm.github.io/libconfig/"; + description = "C/C++ library for processing configuration files"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ stv0g ]; + platforms = lib.platforms.all; }; -} +}) From 05749c700270e1c3c6b31a764e7b463218382891 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 11:21:37 +0100 Subject: [PATCH 200/215] libconfig: migrate to by-name --- .../libconfig/default.nix => by-name/li/libconfig/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libconfig/default.nix => by-name/li/libconfig/package.nix} (100%) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/by-name/li/libconfig/package.nix similarity index 100% rename from pkgs/development/libraries/libconfig/default.nix rename to pkgs/by-name/li/libconfig/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46bc00824633..4c6a293bb64b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9587,8 +9587,6 @@ with pkgs; libcork = callPackage ../development/libraries/libcork { }; - libconfig = callPackage ../development/libraries/libconfig { }; - libcmis = callPackage ../development/libraries/libcmis { }; libee = callPackage ../development/libraries/libee { }; From db9d29e7f11b164b7a6488f776723a98f765e7b3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 26 Oct 2024 21:56:48 +0200 Subject: [PATCH 201/215] ungoogled-chromium: 130.0.6723.58-1 -> 130.0.6723.69-1 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_22.html This update includes 3 security fixes. CVEs: CVE-2024-10229 CVE-2024-10230 CVE-2024-10231 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6e385ef01736..202375b4867e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-09-09"; }; ungoogled-patches = { - hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM="; - rev = "130.0.6723.58-1"; + hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU="; + rev = "130.0.6723.69-1"; }; }; - hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; - version = "130.0.6723.58"; + hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; + version = "130.0.6723.69"; }; } From fbd58d880ea9d906f582c6b73ca358608ee55eb1 Mon Sep 17 00:00:00 2001 From: cjshearer Date: Sun, 27 Oct 2024 10:13:54 -0400 Subject: [PATCH 202/215] ytmdesktop: 2.0.5 -> 2.0.6 --- pkgs/by-name/yt/ytmdesktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index 21d32541bcc3..f6e04c930b7b 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -3,7 +3,7 @@ asar, commandLineArgs ? "", copyDesktopItems, - electron_30, + electron_33, fetchurl, makeDesktopItem, makeWrapper, @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ytmdesktop"; - version = "2.0.5"; + version = "2.0.6"; desktopItems = [ (makeDesktopItem { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${finalAttrs.version}/youtube-music-desktop-app_${finalAttrs.version}_amd64.deb"; - hash = "sha256-0j8HVmkFyTk/Jpq9dfQXFxd2jnLwzfEiqCgRHuc5g9o="; + hash = "sha256-uLTnVA9ooGlbtmUGoYtrT9IlOhTAJpEXMr1GSs3ae/8="; }; unpackPhase = '' @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { fixupPhase = '' runHook preFixup - makeWrapper ${lib.getExe electron_30} $out/bin/ytmdesktop \ + makeWrapper ${lib.getExe electron_33} $out/bin/ytmdesktop \ --add-flags $out/lib/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; mainProgram = finalAttrs.pname; maintainers = [ lib.maintainers.cjshearer ]; - inherit (electron_30.meta) platforms; + inherit (electron_33.meta) platforms; # While the files we extract from the .deb are cross-platform (javascript), the installation # process for darwin is different, and I don't have a test device. PRs are welcome if you can # add the correct installation steps. I would suggest looking at the following: From 5adedec5200d3fd4f511d1607b5217957b206f92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 27 Oct 2024 16:43:21 +0100 Subject: [PATCH 203/215] evcc: 0.131.1 -> 0.131.2 https://github.com/evcc-io/evcc/releases/tag/0.131.2 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index ebce97dcc464..11825118ce0b 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.131.1"; + version = "0.131.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-GEIiAjurbLLY+HMOxP40E3plZe2EsS82mxKSj9wheQI="; + hash = "sha256-Ag+FIsItAY+C250qfMmCbQF46I0QFB07vUsqHqRsHDw="; }; - vendorHash = "sha256-T3SmFnGOw6AJaji4tR1uK+lQj8JNcUMJErUuhwdg3gA="; + vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-RoCEvbn3sM1lLtrk+Kxi4vqYsqxJt79b0VZZgA8MQBA="; + hash = "sha256-4PBlN2pbr7dzZNQzh/P0kBlsg6ut2XPwsfFB132hWO0="; }; nativeBuildInputs = [ From c7d00bca5ea1a7e568fe460c283f1292a6248c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Oct 2024 08:44:13 -0700 Subject: [PATCH 204/215] python312Packages.bite-parser: 0.2.4 -> 0.2.5 Diff: https://github.com/jgosmann/bite-parser/compare/refs/tags/v0.2.4...v0.2.5 Changelog: https://github.com/jgosmann/bite-parser/blob/refs/tags/v0.2.5/CHANGELOG.rst --- .../python-modules/bite-parser/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix index 76abaebf6364..1b00a055a1f2 100644 --- a/pkgs/development/python-modules/bite-parser/default.nix +++ b/pkgs/development/python-modules/bite-parser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, poetry-core, pytest-asyncio, pytestCheckHook, @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "bite-parser"; - version = "0.2.4"; + version = "0.2.5"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - format = "pyproject"; - - src = fetchPypi { - pname = "bite_parser"; - inherit version; - hash = "sha256-Uq2FDoo5gztMRqtdkKYX0RULhjFgy+DeujC6BTZ3CZI="; + src = fetchFromGitHub { + owner = "jgosmann"; + repo = "bite-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-C508csRbjCeLgkp66TwDuxUtMITTmub5/TFv8x80HLA="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous parser taking incremental bites out of your byte input stream"; homepage = "https://github.com/jgosmann/bite-parser"; - changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/jgosmann/bite-parser/blob/${src.rev}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; From 059f99c483b27ab81c1a4f169d9662c4d841c169 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 23 Sep 2024 16:53:15 +0200 Subject: [PATCH 205/215] softether: 4.38 -> 4.41 --- pkgs/by-name/so/softether/package.nix | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/so/softether/package.nix b/pkgs/by-name/so/softether/package.nix index 2f7cba342808..e1d8d575f99e 100644 --- a/pkgs/by-name/so/softether/package.nix +++ b/pkgs/by-name/so/softether/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, openssl, readline, ncurses, @@ -9,14 +9,15 @@ dataDir ? "/var/lib/softether", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "softether"; - version = "4.38"; - build = "9760"; + version = "4.41-9782-beta"; - src = fetchurl { - url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6"; + src = fetchFromGitHub { + owner = "SoftEtherVPN"; + repo = "SoftEtherVPN_Stable"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-yvN5hlfAtE+gWm0s/TY/Lp53By5SDHyQIvvDutRnDNQ="; }; buildInputs = [ @@ -40,11 +41,14 @@ stdenv.mkDerivation rec { Makefile ''; - meta = with lib; { + meta = { description = "Open-Source Free Cross-platform Multi-protocol VPN Program"; homepage = "https://www.softether.org/"; - license = licenses.asl20; - maintainers = [ maintainers.rick68 ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.rick68 ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; -} +}) From c95f4961df4c3811d0749c59d7acd530b213be59 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sun, 27 Oct 2024 10:10:36 -0700 Subject: [PATCH 206/215] minecraft-server: 1.21.1 -> 1.21.3 Change log: - [1.21.2](https://feedback.minecraft.net/hc/en-us/articles/31261174284557) - [1.21.3](https://feedback.minecraft.net/hc/en-us/articles/31289611893645) --- pkgs/games/minecraft-servers/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 38a92caeba23..39d57e02cae5 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.21": { - "sha1": "59353fb40c36d304f2035d51e7d6e6baa98dc05c", - "url": "https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar", - "version": "1.21.1", + "sha1": "45810d238246d90e811d896f87b14695b7fb6839", + "url": "https://piston-data.mojang.com/v1/objects/45810d238246d90e811d896f87b14695b7fb6839/server.jar", + "version": "1.21.3", "javaVersion": 21 }, "1.20": { From 7d0b02d9d3ff7ef8f58040bbd706df2fbc3b1b05 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 27 Oct 2024 18:23:43 +0100 Subject: [PATCH 207/215] .git-blame-ignore-revs: fix ignoring reverted formatting --- .git-blame-ignore-revs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 70194d5cefa6..776f5596fea8 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -194,4 +194,9 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b 8d14fa2886fec877690c6d28cfcdba4503dbbcea # nixos/virtualisation: format image-related files +# Original formatting commit that was reverted +04fadac429ca7d6b92025188652376c230205730 +# Revert commit +4cec81a9959ce612b653860dcca53101a36f328a +# Final commit that does the formatting 88b285c01d84de82c0b2b052fd28eaf6709c2d26 From 3ca0ed36ed6b1f1d15592ac7a6975dd0929c96e3 Mon Sep 17 00:00:00 2001 From: phaer Date: Sun, 27 Oct 2024 18:38:03 +0100 Subject: [PATCH 208/215] amazonImageAutomaticSize: fix diskSize option --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index f77b9983e496..797a07ec575e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -312,7 +312,7 @@ in rec { [ configuration versionModule ./maintainers/scripts/ec2/amazon-image.nix - ({ ... }: { amazonImage.virtualisation.diskSize = "auto"; }) + ({ ... }: { virtualisation.diskSize = "auto"; }) ]; }).config.system.build.amazonImage) From 251461d94fc2ac3233592e4eb02c3eea6b42b22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Oct 2024 10:40:29 -0700 Subject: [PATCH 209/215] python312Packages.hahomematic: 2024.10.8 -> 2024.10.14 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2024.10.8...2024.10.14 Changelog: https://github.com/danielperna84/hahomematic/blob/refs/tags/2024.10.14/changelog.md --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 68de99e2656a..b9f8513459f4 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.10.8"; + version = "2024.10.14"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-NFDh6XA6c1IWTHYjXB19V2kEW3ZkjFU/mz5XduzXj+g="; + hash = "sha256-1AOSKFcLzJn8nlFHj0Bl/XH6nvJRvGMmJoBFJjRRkVA="; }; __darwinAllowLocalNetworking = true; From f8bff391b83b9fa5ffd55f48f1261ad38cd238c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Oct 2024 10:41:41 -0700 Subject: [PATCH 210/215] home-assistant-custom-components.homematicip_local: 1.67.0 -> 1.68.1 Diff: https://github.com/danielperna84/custom_homematic/compare/refs/tags/1.67.0...1.68.1 Changelog: https://github.com/danielperna84/custom_homematic/blob/1.68.1/changelog.md --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 73924b838e39..fc4479ed7053 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.67.0"; + version = "1.68.1"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-lKjBt5oMSdGHXUddaGM+BQOhFnsobvgf2k6qMu2uofY="; + hash = "sha256-LRsLSMtPxc/v+zu//I+huGeFaa9i+NGtOLWmEiSwg9g="; }; dependencies = [ From ffdf1ac76d44f9908eebd58b7a684560ec736b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 22 Oct 2024 21:23:22 +0200 Subject: [PATCH 211/215] lora: init at 3.005 --- pkgs/by-name/lo/lora/package.nix | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/lo/lora/package.nix diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix new file mode 100644 index 000000000000..a062c11e04d0 --- /dev/null +++ b/pkgs/by-name/lo/lora/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation rec { + pname = "lora"; + version = "v3.005"; + + src = fetchFromGitHub { + owner = "cyrealtype"; + repo = "lora"; + rev = version; + hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; + }; + + dontConfigure = true; + dontBuild = true; + + passthru.updateScript = nix-update-script { }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp -R $src/fonts/ttf/*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + description = "Lora is a well-balanced contemporary serif with roots in calligraphy"; + homepage = "https://github.com/cyrealtype/lora"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ofalvai ]; + }; +} From a9a25431c3a22c529bf19bbfa47513bb73b31f91 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sun, 27 Oct 2024 10:43:52 -0700 Subject: [PATCH 212/215] rrsync: correct meta.mainProgram MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rrsync.meta inherits from rsync.meta, so #248417 had the effect of setting rrsync.meta.mainProgram to "rsync", which doesn’t exist: /nix/store/…-rrsync-3.3.0/bin/rsync: No such file or directory Re #298509 --- pkgs/applications/networking/sync/rsync/rrsync.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 67cec6eeeeaf..7bbdbf3adc1e 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { meta = rsync.meta // { description = "Helper to run rsync-only environments from ssh-logins"; + mainProgram = "rrsync"; }; } From 1d488c468de3880d12b0393b1c1c3e18a021f109 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Oct 2024 15:56:56 +0100 Subject: [PATCH 213/215] nextcloud-client: 3.14.1 -> 3.14.2 ChangeLog: https://github.com/nextcloud/desktop/releases/tag/v3.14.2 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 01ced9fc8631..8c09422a11ff 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.14.1"; + version = "3.14.2"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc="; + hash = "sha256-vxCt/FNfQZ7rWME2zLGESgW/+FNoENZeCr8FFcGwoFQ="; }; patches = [ From 70a2342c5d40e1bb63bfcfd50e1a29b659b232b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 14:22:33 +0000 Subject: [PATCH 214/215] fzf: 0.55.0 -> 0.56.0 --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index f133ec7b6158..809e5133d820 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-4ikNCepLF7odkaEO+tzgrHb4528LetPEeMStJVZyjWg="; + hash = "sha256-HG2GQwic1wJ0OiCinBEZ1wfjqXuq37udEpBwLt7LIA0="; }; - vendorHash = "sha256-b7hCXDJ/EJr1sEvmS2RYaxBMkdWOo2LWe76mamD3BSY="; + vendorHash = "sha256-dsQyoSJQT5PwhZ/anth5YjNXf6ZubrCza6kXWZJ3DgA="; CGO_ENABLED = 0; From 3ec0c23469c35202a47378cbed136ea6e6c20726 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 27 Oct 2024 22:32:26 +0100 Subject: [PATCH 215/215] vscode-extensions.visualjj.visualjj: 0.12.0 -> 0.12.1 --- .../vscode/extensions/visualjj.visualjj/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 1cee541ab629..d30107a1fb03 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -3,32 +3,31 @@ stdenv, vscode-utils, fetchurl, - ... }: let - version = "0.12.0"; + version = "0.12.1"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-7zIe5yTSpAhkG4S+k2SAnp4ZOrbbSsdxExpRfMG5EAo="; + hash = "sha256-Tf26s4YDyjYUrVdKu9aYMMntirZyNRgnETMzO/EfFCA="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-0mBNcrfDUqdPfQyc38/Z8YppFP8u9tbxpOLWrQriviE="; + hash = "sha256-2u92qFaRIirCrvtuxeqVqt6zWEobS1f5SX26SGZF4xE="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-YvKTs+kA4PghQkduq3aIx20bnGv1VnCtMqLmkLADfbE="; + hash = "sha256-+NUdF/KIWhLXOGtUgmNI9JF+L+f/4o064gznpLiORVM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-gV8VKwPBsgUCDd/A02ASNozuBl/tt5FW0xKOgVKVgAM="; + hash = "sha256-GVEOTgfSKc0YXZUF4WGl/56Jd4ucaeDm9nB+267BQoM="; }; }; in