From bfa517208efc8cc7a2034f6ed136a88680ee7d66 Mon Sep 17 00:00:00 2001 From: "David E. C. Kopczynski" Date: Fri, 15 Nov 2024 04:37:50 +0100 Subject: [PATCH 01/79] maintainers: add David-Kopczynski --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d975ebfc7ea5..b42fb30589cc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5015,6 +5015,12 @@ githubId = 118536343; name = "David Hamelin"; }; + David-Kopczynski = { + name = "David Elias Chris Kopczynski"; + email = "mail@davidkopczynski.com"; + github = "David-Kopczynski"; + githubId = 53194670; + }; david-r-cox = { email = "david@integrated-reasoning.com"; github = "david-r-cox"; From f640d0570df9caca074823baef64f5be8fa6a62c Mon Sep 17 00:00:00 2001 From: "David E. C. Kopczynski" Date: Fri, 15 Nov 2024 04:42:16 +0100 Subject: [PATCH 02/79] maintainers: add Jojo4GH --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b42fb30589cc..421784775bc1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10708,6 +10708,11 @@ name = "Joonas Rautiola"; keys = [ { fingerprint = "87EC DD30 6614 E510 5299 F0D4 090E B48A 4669 AA54"; } ]; }; + Jojo4GH = { + name = "Jonas Broeckmann"; + github = "Jojo4GH"; + githubId = 36777568; + }; jojosch = { name = "Johannes Schleifenbaum"; email = "johannes@js-webcoding.de"; From b9ad375933e3e523f0a9dd4f1f51e846014bab10 Mon Sep 17 00:00:00 2001 From: "David E. C. Kopczynski" Date: Fri, 15 Nov 2024 05:06:12 +0100 Subject: [PATCH 03/79] nav: init at 1.2.1 --- pkgs/by-name/na/nav/package.nix | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/na/nav/package.nix diff --git a/pkgs/by-name/na/nav/package.nix b/pkgs/by-name/na/nav/package.nix new file mode 100644 index 000000000000..f5aeaa069db4 --- /dev/null +++ b/pkgs/by-name/na/nav/package.nix @@ -0,0 +1,62 @@ +{ + stdenv, + lib, + fetchzip, + nix-update-script, + autoPatchelfHook, + libxcrypt-legacy, +}: + +let + system = stdenv.hostPlatform.parsed.cpu.name; + platform = "${system}-unknown-linux-gnu"; +in +stdenv.mkDerivation rec { + pname = "nav"; + version = "1.2.1"; + + src = fetchzip { + url = "https://github.com/Jojo4GH/nav/releases/download/v${version}/nav-${platform}.tar.gz"; + sha256 = + { + x86_64-linux = "sha256-ihn5wlagmujHlSfJpgojQNqa4NjLF1wk2pt8wHi60DY="; + aarch64-linux = "sha256-l3rKu3OU/TUUjmx3p06k9V5eN3ZDNcxbxObLqVQ2B7U="; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + stdenv.cc.cc.lib + libxcrypt-legacy + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp nav $out/bin + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Interactive and stylish replacement for ls & cd"; + longDescription = '' + To make use of nav, add the following lines to your configuration: + `programs.bash.shellInit = "eval \"$(nav --init bash)\"";` and + `programs.zsh.shellInit = "eval \"$(nav --init zsh)\"";` + ''; + homepage = "https://github.com/Jojo4GH/nav"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + David-Kopczynski + Jojo4GH + ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "nav"; + }; +} From b7bf4060216fe8bc200ee4f086b2fd600eaf2e53 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 6 Dec 2024 10:18:44 -0500 Subject: [PATCH 04/79] zfs_2_1: 2.1.15 -> 2.1.16 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.1.16 Diff: https://github.com/openzfs/zfs/compare/zfs-2.1.15...zfs-2.1.16 --- pkgs/os-specific/linux/zfs/2_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix index 885ebca73abb..bc2ada0a901c 100644 --- a/pkgs/os-specific/linux/zfs/2_1.nix +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -18,9 +18,9 @@ callPackage ./generic.nix args { # This is a fixed version to the 2.1.x series, move only # if the 2.1.x series moves. - version = "2.1.15"; + version = "2.1.16"; - hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY="; + hash = "sha256-egs7paAOdbRAJH4QwIjlK3jAL/le51kDQrdW4deHfAI="; tests = { inherit (nixosTests.zfs) series_2_1; From ce33e20a03de383dea7d04ec5680d342a8345493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Dec 2024 20:56:06 -0800 Subject: [PATCH 05/79] fetchFromGitHub: expose tag argument --- pkgs/build-support/fetchgithub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index f80e01295533..ed24a6239449 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -73,5 +73,5 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; } +fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo tag; } ) From 6ad66fd16c2e5b87ff3c6cfe95972888240fa9fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 04:37:13 +0000 Subject: [PATCH 06/79] zoekt: 3.7.2-2-unstable-2024-10-24 -> 3.7.2-2-unstable-2024-12-09 --- pkgs/by-name/zo/zoekt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 81182b2d9d6c..fd7bcbc06d78 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2024-10-24"; + version = "3.7.2-2-unstable-2024-12-09"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "bfd8ee868c4c3fe509fa0fd4f2b8c68d84805ff9"; - hash = "sha256-hoKMD/nTX0r2PEM0qRhAQFXM45UhDztwK0epL2EIMY8="; + rev = "37c4df87f75cb0de7b71181301e0f6df6aa9ade6"; + hash = "sha256-pH21Kz/qMs7Cy1nKoaWOzUt6W9jBYtmgIiF6GIcdwsg="; }; - vendorHash = "sha256-QZysaEBZ1/ISPRkUPr6UIEUlWv/aHEwk8B/wxaYe7zU="; + vendorHash = "sha256-Dvs8XMOxZEE9moA8aCxuxg947+x/6C8cKtgdcByL4Eo="; nativeCheckInputs = [ git From 0852cf61fbab34cb0211e11dd2de5b4479d27304 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:17:48 +0800 Subject: [PATCH 07/79] deepin.dtk6core: 6.0.19 -> 6.0.24 --- pkgs/desktops/deepin/library/dtk6core/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index a66523671427..97ac2fb5843f 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -15,23 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; + hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/raw/d2e991f96b2940e8533b7e944bab5a7dd6aa0fb7/qt-6.8.patch"; - hash = "sha256-HZxUrtUmVwnNUwcBoU7ewb+McsRkALQglPBbJU8HTkk="; - }) ]; postPatch = '' From c172f4770b2d960657216ce9dc9c5db200ecea96 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:18:54 +0800 Subject: [PATCH 08/79] deepin.dde-application-manager: 1.2.15 -> 1.2.19 --- pkgs/desktops/deepin/core/dde-application-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index d265cfdc6c06..cf1ae2d6dec3 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dde-application-manager"; - version = "1.2.15"; + version = "1.2.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-9WKKM3SAMgW+UL0DnzDFqA+HHi7euF/yyTyKSbrIgV4="; + hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8="; }; nativeBuildInputs = [ From 149b50f9a31fe40b98946298548c476e76048d1b Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:22:36 +0800 Subject: [PATCH 09/79] deepin.dtk6gui: 6.0.19 -> 6.0.24 --- pkgs/desktops/deepin/library/dtk6gui/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 99888c90e066..4204ad9f2356 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -13,23 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; + hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/b6b8521fd69c28dbca5f6e8d1d8258c904b6caf1/qt-6.8.patch"; - hash = "sha256-Fu5vwvKJGMW94JYoIPvDCeXs8WrAskQlVRX/3FYQFGY="; - }) ]; postPatch = '' @@ -47,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6Packages.qtbase + qt6Packages.qtwayland librsvg ]; From de5566c9722ddccf10d00f181991ac917ef40fc2 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:35:48 +0800 Subject: [PATCH 10/79] deepin.dtk6widget: 6.0.19 -> 6.0.24 --- pkgs/desktops/deepin/library/dtk6widget/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index 2813dbb949fd..b1400c9cf9c8 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -14,23 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; + hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/c4ac094715daa4ec319dc4d55bbca9d818845f82/qt-6.8.patch"; - hash = "sha256-XEgtAV0mF1+C26wCaukjuv4WNbP4ISGgXt/eav7h9ko="; - }) ]; postPatch = '' From 55c4bd3d385de90eef95342d84732c09a3a1a138 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:36:12 +0800 Subject: [PATCH 11/79] deepin.dtk6declarative: 6.0.19 -> 6.0.24 --- .../library/dtk6declarative/default.nix | 5 +- .../dtk6declarative/fix-build-on-qt-6.8.patch | 135 ------------------ 2 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index 1011faf0f199..9092cafdac51 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,19 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; + hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - ./fix-build-on-qt-6.8.patch ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch deleted file mode 100644 index ab09398c0123..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt -index 4314b72..a7ecaf1 100644 ---- a/qt6/src/CMakeLists.txt -+++ b/qt6/src/CMakeLists.txt -@@ -25,6 +25,7 @@ dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV}) - qt_add_translations(${LIB_NAME} - TS_FILES ${TS_FILES} - QM_FILES_OUTPUT_VARIABLE QM_FILES -+ IMMEDIATE_CALL - ) - - set_target_properties(${LIB_NAME} PROPERTIES -diff --git a/src/private/dbackdropnode.cpp b/src/private/dbackdropnode.cpp -index 91c398a..1ed0ad8 100644 ---- a/src/private/dbackdropnode.cpp -+++ b/src/private/dbackdropnode.cpp -@@ -320,8 +320,8 @@ public: - renderer->setDevicePixelRatio(base->devicePixelRatio()); - renderer->setDeviceRect(base->deviceRect()); - renderer->setViewportRect(base->viewportRect()); -- renderer->setProjectionMatrix(base->projectionMatrix()); -- renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC()); -+ renderer->setProjectionMatrix(base->projectionMatrix(0)); -+ renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC(0)); - } else { - renderer->setDevicePixelRatio(1.0); - renderer->setDeviceRect(QRect(QPoint(0, 0), pixelSize)); -@@ -336,8 +336,8 @@ public: - } - - if (Q_UNLIKELY(!matrix.isIdentity())) { -- renderer->setProjectionMatrix(renderer->projectionMatrix() * matrix); -- renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC() * matrix); -+ renderer->setProjectionMatrix(renderer->projectionMatrix(0) * matrix); -+ renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC(0) * matrix); - } - - renderer->setRootNode(rootNode); -diff --git a/src/private/dmaskeffectnode.cpp b/src/private/dmaskeffectnode.cpp -index c4db07d..da1e4ce 100644 ---- a/src/private/dmaskeffectnode.cpp -+++ b/src/private/dmaskeffectnode.cpp -@@ -35,7 +35,7 @@ protected: - class OpaqueTextureMaterialShader : public QSGOpaqueTextureMaterialRhiShader - { - public: -- OpaqueTextureMaterialShader(); -+ OpaqueTextureMaterialShader(int viewCount); - - bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - -@@ -48,7 +48,7 @@ public: - class TextureMaterialShader : public OpaqueTextureMaterialShader - { - public: -- TextureMaterialShader(); -+ TextureMaterialShader(int viewCount); - - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override; -@@ -61,7 +61,8 @@ protected: - #endif - }; - --OpaqueTextureMaterialShader::OpaqueTextureMaterialShader() -+OpaqueTextureMaterialShader::OpaqueTextureMaterialShader(int viewCount) -+ : QSGOpaqueTextureMaterialRhiShader(viewCount) - { - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #if QT_CONFIG(opengl) -@@ -236,8 +237,8 @@ bool OpaqueTextureMaterialShader::updateGraphicsPipelineState(RenderState &state - } - #endif - --TextureMaterialShader::TextureMaterialShader() -- : OpaqueTextureMaterialShader() -+TextureMaterialShader::TextureMaterialShader(int viewCount) -+ : OpaqueTextureMaterialShader(viewCount) - { - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // TODO qt6 - #if QT_CONFIG(opengl) -@@ -529,7 +530,7 @@ QSGMaterialShader *TextureMaterial::createShader() const - QSGMaterialShader *TextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new TextureMaterialShader; -+ return new TextureMaterialShader(viewCount()); - } - #endif - -@@ -553,7 +554,7 @@ QSGMaterialShader *OpaqueTextureMaterial::createShader() const - QSGMaterialShader *OpaqueTextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new OpaqueTextureMaterialShader; -+ return new OpaqueTextureMaterialShader(viewCount()); - } - #endif - -diff --git a/src/private/drectanglenode.cpp b/src/private/drectanglenode.cpp -index efeeab6..b961588 100644 ---- a/src/private/drectanglenode.cpp -+++ b/src/private/drectanglenode.cpp -@@ -72,7 +72,8 @@ void CornerColorShader::initialize() - m_idQtOpacity = program->uniformLocation("qt_Opacity"); - } - #else --CornerColorShader::CornerColorShader() -+CornerColorShader::CornerColorShader(int viewCount) -+ : QSGOpaqueTextureMaterialRhiShader(viewCount) - { - setShaderFileName(QSGMaterialShader::VertexStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.vert.qsb")); - setShaderFileName(QSGMaterialShader::FragmentStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.frag.qsb")); -@@ -128,7 +129,7 @@ QSGMaterialShader *CornerColorMaterial::createShader() const - QSGMaterialShader *CornerColorMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new CornerColorShader; -+ return new CornerColorShader(viewCount()); - } - #endif - -diff --git a/src/private/drectanglenode_p.h b/src/private/drectanglenode_p.h -index aee5a7c..7962154 100644 ---- a/src/private/drectanglenode_p.h -+++ b/src/private/drectanglenode_p.h -@@ -37,7 +37,7 @@ private: - class CornerColorShader : public QSGOpaqueTextureMaterialRhiShader - { - public: -- CornerColorShader(); -+ CornerColorShader(int viewCount); - bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); - }; - #endif From 4ed970fdef4919074766a94defa331e4d656b7ed Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:39:10 +0800 Subject: [PATCH 12/79] deepin.qt6integration: 6.0.19 -> 6.0.24 --- pkgs/desktops/deepin/library/qt6integration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 19f6d5f93669..1383ef81e07e 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; + hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw="; }; nativeBuildInputs = [ From c66a709ed433781d5eca1883cf87c0474baa0e1c Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:40:45 +0800 Subject: [PATCH 13/79] deepin.qt6platform-plugins: 6.0.19 -> 6.0.24 --- pkgs/desktops/deepin/library/qt6platform-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 93ac45236ba9..2befb9219bd3 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; + hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4="; }; postUnpack = '' From 49a4f198e4a46551b56c6b202ec232d37890552d Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:49:28 +0800 Subject: [PATCH 14/79] deepin.treeland-protocols: init at 0.4.5 --- pkgs/desktops/deepin/default.nix | 1 + .../library/treeland-protocols/default.nix | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/desktops/deepin/library/treeland-protocols/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index c86e77e2b9af..df3b8e7f3fc0 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -39,6 +39,7 @@ let qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; qt6integration = callPackage ./library/qt6integration { }; qt6mpris = callPackage ./library/qt6mpris { }; + treeland-protocols = callPackage ./library/treeland-protocols { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix new file mode 100644 index 000000000000..f1b8016bb978 --- /dev/null +++ b/pkgs/desktops/deepin/library/treeland-protocols/default.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "treeland-protocols"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Wayland protocol extensions for treeland"; + homepage = "https://github.com/linuxdeepin/treeland-protocols"; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + asl20 + ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} From d384030cc64f925d88adf1a9e9dd35cd61e75301 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:50:38 +0800 Subject: [PATCH 15/79] deepin.dde-tray-loader: 1.0.1 -> 1.0.7 --- pkgs/desktops/deepin/core/dde-tray-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index 06d76e0398fd..6c3b7febf80b 100644 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "1.0.1"; + version = "1.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; rev = finalAttrs.version; - hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; + hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw="; }; patches = [ From 16db3c0ba53523b8bcfbde17ba3908b6d6356d29 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:56:38 +0800 Subject: [PATCH 16/79] deepin.dde-shell: 1.0.2 -> 1.0.9 --- .../deepin/core/dde-shell/default.nix | 9 ++++++--- .../fix-dock-can-not-show-with-qt6_8.diff | 20 ------------------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index ee1558ef6145..62663f6756e9 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -13,26 +13,27 @@ qt6integration, qt6platform-plugins, dde-tray-loader, + dde-application-manager, wayland, wayland-protocols, + treeland-protocols, yaml-cpp, xorg, }: stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "1.0.2"; + version = "1.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; rev = finalAttrs.version; - hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; + hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg="; }; patches = [ ./fix-path-for-nixos.diff - ./fix-dock-can-not-show-with-qt6_8.diff ]; postPatch = '' @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dde-tray-loader + dde-application-manager dtk6declarative dtk6widget dde-qt-dbus-factory @@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { qt6integration wayland wayland-protocols + treeland-protocols yaml-cpp xorg.libXcursor xorg.libXres diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff b/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff deleted file mode 100644 index c372dc1e5cf2..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/panels/dock/OverflowContainer.qml b/panels/dock/OverflowContainer.qml -index 74ca966..312f2a0 100644 ---- a/panels/dock/OverflowContainer.qml -+++ b/panels/dock/OverflowContainer.qml -@@ -52,13 +52,13 @@ Item { - for (let child of listView.contentItem.visibleChildren) { - width = calculateImplicitWidth(width, child.implicitWidth) - } -- return width -+ return Math.max(width, 1) - } - implicitHeight: { - let height = 0 - for (let child of listView.contentItem.visibleChildren) { - height = calculateImplicitHeight(height, child.implicitHeight) - } -- return height -+ return Math.max(height, 1) - } - } From 110658a687a23d680e96f4296e8cd4a6d532d649 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 17:38:14 +0800 Subject: [PATCH 17/79] deepin.dde-launchpad: 1.0.2 -> 1.0.8 --- pkgs/desktops/deepin/core/dde-launchpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 1a7b2cb5107c..63b625fe90aa 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "1.0.2"; + version = "1.0.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; + hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0="; }; nativeBuildInputs = [ From 7e3be2c0511772afa2904f90dc9386e66ce9aa8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 12:55:09 +0000 Subject: [PATCH 18/79] doomretro: 5.5.1 -> 5.6 --- pkgs/by-name/do/doomretro/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index 810acbb06daa..debbdce7a0d1 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.5.1"; + version = "5.6"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-gAMMzHUo0uPXIRqT1NOMWpFNAtE1Pth5uXFa2Dps90E="; + hash = "sha256-ykErEXKpd/79cUhubZiLC7u10yJy8oYCWOMeHLYRHts="; }; nativeBuildInputs = [ From aa4894e388adeeb82aaac777e4382b9d198f4d57 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 10 Dec 2024 21:41:43 +0400 Subject: [PATCH 19/79] =?UTF-8?q?sealcurses:=202023-02-06=20=E2=86=92=2020?= =?UTF-8?q?24-12-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/se/sealcurses/package.nix | 38 ++++++++++++++++++-------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/se/sealcurses/package.nix b/pkgs/by-name/se/sealcurses/package.nix index ad1eb0bb276d..efc40858f655 100644 --- a/pkgs/by-name/se/sealcurses/package.nix +++ b/pkgs/by-name/se/sealcurses/package.nix @@ -1,28 +1,42 @@ -{ lib, stdenv, fetchFromGitea, cmake, pkg-config, ncurses, the-foundation }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + pkg-config, + ncurses, + the-foundation, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sealcurses"; - version = "unstable-2023-02-06"; # No release yet + version = "0-unstable-2024-12-02"; # No release yet src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; - repo = pname; - rev = "e11026ca34b03c5ab546512f82a6f705d0c29e95"; - hash = "sha256-N+Tvg2oIcfa68FC7rKuLxGgEKz1oBEEb8NGCiBuZ8y4="; + repo = "sealcurses"; + rev = "310348a6b88678a47d371c7edfcc1e8c76ca1677"; + hash = "sha256-SEK3w6pVrYi+h2l5RuULpORYPnm8H78lEVR01cMkku0="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ ncurses the-foundation ]; + buildInputs = [ + ncurses + the-foundation + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - meta = with lib; { + meta = { description = "SDL Emulation and Adaptation Layer for Curses (ncursesw)"; homepage = "https://git.skyjake.fi/skyjake/sealcurses"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; } From 4e5452adc436d493a5b92a607fea7483af8301c5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 10 Dec 2024 21:42:31 +0400 Subject: [PATCH 20/79] =?UTF-8?q?lagrange:=201.18.3=20=E2=86=92=201.18.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index c91d9d1fe91c..80a741f76382 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-ewpSZD+pCr6gbzT+4lW2+6tssPNLq4rqgUx7p8IsjIY="; + hash = "sha256-Bty2TRL5blduhucYmI6x3RZVdgrY0/7Dtm5kgQ2N3ec="; }; nativeBuildInputs = [ From 92e3afea0429ccb13c86790381233590792ff74d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 00:48:06 +0000 Subject: [PATCH 21/79] netbeans: 23 -> 24 --- pkgs/by-name/ne/netbeans/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix index f0a54453bbff..2f8be3be2c30 100644 --- a/pkgs/by-name/ne/netbeans/package.nix +++ b/pkgs/by-name/ne/netbeans/package.nix @@ -13,7 +13,7 @@ }: let - version = "23"; + version = "24"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-UNTW0K8JlkxOKz9oO3HUBPZ4yZY7uWBkFZd2uenXtZA="; + hash = "sha256-mzmviZuyS68SZhOAzwWOdZLveOTS5UOgY1oW+oAv9Gs="; }; buildCommand = '' From 647b477cfc34d5ec522e89c1a1b075f27d2efa12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 04:17:45 +0000 Subject: [PATCH 22/79] doublecmd: 1.1.19 -> 1.1.21 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 4c9f7e3d49cc..ce5237d5c7ef 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.19"; + version = "1.1.21"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-3OHlC6+oHB1xW2uYFeQn3paJDvo2PZytdzv98G/qqmg="; + hash = "sha256-NsjsjCSPbo7zwejmOjFRuQpcMyGZEY67hyStjtMrIGk="; }; nativeBuildInputs = [ From 0545d833b0518f12d80d533bc6afdd263a64e45d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:19:40 +0100 Subject: [PATCH 23/79] python312Packages.wled: 0.20.2 -> 0.21.0 Diff: https://github.com/frenck/python-wled/compare/refs/tags/v0.20.2...v0.21.0 Changelog: https://github.com/frenck/python-wled/releases/tag/v0.21.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 196397ab7f1d..d266f2ab7634 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-7P/V83dGkfJJjZxZtiEwQXIY7CeBZ/fmvTdEjDirKj0="; + hash = "sha256-yJ7tiJWSOpkkLwKXo4lYlDrp1FEJ/cGoDaXJamY4ARg="; }; postPatch = '' From 2734fe9372fc71bd65fdcccec471a8913717a95c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:58:02 +0100 Subject: [PATCH 24/79] python312Packages.fnllm: init at 0.0.11 A function-based LLM protocol and wrapper https://github.com/microsoft/essex-toolkit/tree/main/python/fnllm --- .../python-modules/fnllm/default.nix | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/fnllm/default.nix diff --git a/pkgs/development/python-modules/fnllm/default.nix b/pkgs/development/python-modules/fnllm/default.nix new file mode 100644 index 000000000000..9ef3701119f2 --- /dev/null +++ b/pkgs/development/python-modules/fnllm/default.nix @@ -0,0 +1,80 @@ +{ + lib, + aiolimiter, + azure-identity, + azure-storage-blob, + buildPythonPackage, + fetchPypi, + hatchling, + httpx, + json-repair, + openai, + pydantic, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + tenacity, + tiktoken, +}: + +buildPythonPackage rec { + pname = "fnllm"; + version = "0.0.11"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EiCP+HyipL6mpmjb3wjXUr+VRJ9ZO9qsegppNM7gVEk="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + aiolimiter + httpx + json-repair + pydantic + tenacity + ]; + + optional-dependencies = { + azure = [ + azure-identity + azure-storage-blob + ]; + openai = [ + openai + tiktoken + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "fnllm" ]; + + disabledTests = [ + # Tests require network access + "chat" + "embeddings" + "rate_limited" + "test_default_operations" + "test_estimate_request_tokens" + "test_replace_value" + ]; + + disabledTestPaths = [ + "tests/unit/caching/test_blob.py" + ]; + + meta = { + description = "A function-based LLM protocol and wrapper"; + homepage = "https://github.com/microsoft/essex-toolkit/tree/main/python/fnllm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19a640eaf5ef..6832568fb000 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4854,6 +4854,8 @@ self: super: with self; { glyphtools = callPackage ../development/python-modules/glyphtools { }; + fnllm = callPackage ../development/python-modules/fnllm { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; foolscap = callPackage ../development/python-modules/foolscap { }; From ad015ce53b5427b64c68b6dde129d457791f446a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 09:03:50 +0100 Subject: [PATCH 25/79] python311Packages.graphrag: 0.5.0 -> 0.9.0 Diff: https://github.com/microsoft/graphrag/compare/refs/tags/v0.5.0...v0.9.0 Changelog: https://github.com/microsoft/graphrag/blob/v0.9.0/CHANGELOG.md --- pkgs/development/python-modules/graphrag/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index bad18d3388ef..32d75be5178d 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -12,6 +12,7 @@ datashaper, devtools, environs, + fnllm, graspologic, json-repair, lancedb, @@ -39,14 +40,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.5.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-QK6ZdBDSSKi/WUsDQeEY5JfxgsmW/vK7yDfjMseAO/k="; + hash = "sha256-LD7cfea8uyCYVMhsHXQBHho7jiwEmlqYrrfZs/7oeyc="; }; build-system = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { datashaper devtools environs + fnllm graspologic json-repair lancedb From e45aeef5dca300f866db930034114a15280ba640 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 09:34:25 +0100 Subject: [PATCH 26/79] python312Packages.pyituran: init at 0.1.4 Module to interact with the Ituran web service https://github.com/shmuelzon/pyituran --- .../python-modules/pyituran/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/pyituran/default.nix diff --git a/pkgs/development/python-modules/pyituran/default.nix b/pkgs/development/python-modules/pyituran/default.nix new file mode 100644 index 000000000000..ce46b1daceb6 --- /dev/null +++ b/pkgs/development/python-modules/pyituran/default.nix @@ -0,0 +1,49 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyituran"; + version = "0.1.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "shmuelzon"; + repo = "pyituran"; + rev = "refs/tags/${version}"; + hash = "sha256-rgPW+z70Z9wRzPbPtWUHb80vCccWJlEs18Y6llIeipo="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'os.environ["VERSION"]' '"${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyituran" ]; + + meta = { + description = "Module to interact with the Ituran web service"; + homepage = "https://github.com/shmuelzon/pyituran"; + changelog = "https://github.com/shmuelzon/pyituran/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fecbbeecaa84..e00bcd16a5c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10500,6 +10500,8 @@ self: super: with self; { pyisy = callPackage ../development/python-modules/pyisy { }; + pyituran = callPackage ../development/python-modules/pyituran { }; + pyixapi = callPackage ../development/python-modules/pyixapi { }; pykcs11 = callPackage ../development/python-modules/pykcs11 { }; From 83af4332d142455757a0f1d2ab606df196fcd7a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 17:55:41 +0100 Subject: [PATCH 27/79] python311Packages.headerparser: 0.5.1 -> 0.5.2 Diff: https://github.com/jwodder/headerparser/compare/refs/tags/v0.5.1...v0.5.2 Changelog: https://github.com/wheelodex/headerparser/blob/v0.5.2/CHANGELOG.md --- .../python-modules/headerparser/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index d75e26f95511..d0322c1a1acb 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -4,29 +4,29 @@ buildPythonPackage, deprecated, fetchFromGitHub, + hatchling, pytest-mock, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "headerparser"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jwodder"; repo = "headerparser"; rev = "refs/tags/v${version}"; - hash = "sha256-CWXha7BYVO5JFuhWP8OZ95fhUsZ3Jo0cgPAM+O5bfec="; + hash = "sha256-fn9Nlazte6r5JMmp9ynq0qmkLEoJGv8witgZlD7zJNM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs deprecated ]; From e561218ef3f6205ea9ad3b2b3797c7201a504cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 11 Dec 2024 18:04:22 +0100 Subject: [PATCH 28/79] vaultwarden: 1.32.5 -> 1.32.6 Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.6 --- pkgs/tools/security/vaultwarden/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 92f171fb77db..f3a27b5ca4c5 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -22,16 +22,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.32.5"; + version = "1.32.6"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; rev = version; - hash = "sha256-n03SKzwtjPMm+OOUoI9PCnmiDVbrw/117uzfp18MwHc="; + hash = "sha256-amb2wzCVZPDlR9UbH5jh3IAg0XbJmyQNTSJdZiktWCU="; }; - cargoHash = "sha256-Cfk3pTIHauaAyTzjFUQQdvR0GxTU8k2etcx1LfPGGgg="; + useFetchCargoVendor = true; + cargoHash = "sha256-hKnm14OlXDVJcxGKHkvOZWOqAwi1lWBa1IZ0MR+0nso="; # used for "Server Installed" version in admin panel env.VW_VERSION = version; From 4b638f75388039769c7872d544dbca8cc9bff50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 11 Dec 2024 18:12:14 +0100 Subject: [PATCH 29/79] eza: 0.20.11 -> 0.20.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://github.com/eza-community/eza/releases/tag/v0.20.12 Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 6bb16065bc49..f6be5f9d7bbb 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.11"; + version = "0.20.12"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-JK2JXZCtrq5iVgzJ5mIrHSEhlWGgtxhKGVgbN3IuMxg="; + hash = "sha256-x3rq0jLv8INBmaMH0t4vINK9MBwcIukCyMTM0CUTyy0="; }; - cargoHash = "sha256-5KVLxIYmWIcFcGNZUvNOrHrKTy0UD9LQvPn3IGpV6B0="; + cargoHash = "sha256-X35aksmao6pXxzARFgS2UlMxa8usfyFQAhlSug9YStQ="; nativeBuildInputs = [ cmake From 3527ace86e76c4413d758fb438596da958c0beee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 09:18:03 -0800 Subject: [PATCH 30/79] python312Packages.hahomematic: 2024.12.0 -> 2024.12.2 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2024.12.0...2024.12.2 Changelog: https://github.com/danielperna84/hahomematic/blob/refs/tags/2024.12.2/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 63a93a7ed5b7..3b068917c652 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.12.0"; + version = "2024.12.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI="; + hash = "sha256-pQiOi6uJcfeBOPmL9MksHLqnemHD9Qk6e7QTI9J3NCc="; }; __darwinAllowLocalNetworking = true; From c7ea95dbe45dd7c5da31e089b538258ee74e37e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 09:18:13 -0800 Subject: [PATCH 31/79] home-assistant-custom-components.homematicip_local: 1.73.0 -> 1.74.0 Diff: https://github.com/danielperna84/custom_homematic/compare/refs/tags/1.73.0...1.74.0 Changelog: https://github.com/danielperna84/custom_homematic/blob/1.74.0/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 b460d1748824..857867e349ad 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.73.0"; + version = "1.74.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA="; + hash = "sha256-UdM/T68VK3Dh585rm3qnZ9LtRgpumfzk4TaGGIfYdoM="; }; dependencies = [ From 73f6e60f1330d361babe5be7190d559d83f20f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 09:21:52 -0800 Subject: [PATCH 32/79] libdeltachat: 1.151.4 -> 1.151.6 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.4...v1.151.6 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.151.6/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 82ed9b18c5f2..296ca86cd9e3 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.151.4"; + version = "1.151.6"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-GySzclwnplL6GwK01Msn4REzW2eiynLKtEjonvUzMto="; + hash = "sha256-alt4RkZeKz5yqbie3ksu9fKXKapYR0hCaY7vOMicrk8="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-vTmHF7qoAWfou27v6TRPSRvLB+ge/7/aBgW6Bb7tkkI="; + hash = "sha256-++LG3MhmNVfHfMEuaSZrJYsf3NVbPWFD8KoDsiu9/Eg="; }; nativeBuildInputs = [ From c76468f58e79293899c72bf697e992013d6e0ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Dec 2024 09:23:17 -0800 Subject: [PATCH 33/79] deltachat-cursed: 0.9.0 -> 0.10.0 Diff: https://github.com/adbenitez/deltachat-cursed/compare/v0.9.0...v0.10.0 --- pkgs/by-name/de/deltachat-cursed/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/deltachat-cursed/package.nix b/pkgs/by-name/de/deltachat-cursed/package.nix index a8299361d928..fef1b5fd41fa 100644 --- a/pkgs/by-name/de/deltachat-cursed/package.nix +++ b/pkgs/by-name/de/deltachat-cursed/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-z4JKe5soR4FdIn8hugxtnxQr/9V8m8a7QRzE1liIexc="; + hash = "sha256-KCPIZf/8Acp9syFN1IHbf8hQrjk0yzniff+dVSSM/Ro="; }; build-system = with python3.pythonOnBuildForHost.pkgs; [ @@ -26,9 +26,7 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ appdirs deltachat2 - emoji - notify-py - setuptools # for pkg_resources + urwid urwid-readline ]; From 40bd145c4cc9b564dd6f91654969f30e3e9980df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Dec 2024 20:57:13 -0800 Subject: [PATCH 34/79] python312Packages.elevenlabs: fix meta.changelog --- .../python-modules/elevenlabs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index cd29238f4bbd..14e72f843c0b 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -11,15 +11,19 @@ websockets, }: -buildPythonPackage rec { - pname = "elevenlabs"; +let version = "1.9.0"; + tag = version; +in +buildPythonPackage { + pname = "elevenlabs"; + inherit version; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; - rev = "refs/tags/${version}"; + inherit tag; hash = "sha256-0fkt2Z05l95b2S+xoyyy9VGAUZDI1SM8kdcP1PCrUg8="; }; @@ -40,7 +44,7 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/elevenlabs/elevenlabs-python/releases/tag/v${version}"; + changelog = "https://github.com/elevenlabs/elevenlabs-python/releases/tag/${tag}"; description = "Official Python API for ElevenLabs Text to Speech"; homepage = "https://github.com/elevenlabs/elevenlabs-python"; license = lib.licenses.mit; From 82637faae67b7149a5f767a23e9c33d47ffc4cb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 19:20:07 +0000 Subject: [PATCH 35/79] go-musicfox: 4.5.7 -> 4.6.0 --- pkgs/by-name/go/go-musicfox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-musicfox/package.nix b/pkgs/by-name/go/go-musicfox/package.nix index 27508459ed77..1125622d4752 100644 --- a/pkgs/by-name/go/go-musicfox/package.nix +++ b/pkgs/by-name/go/go-musicfox/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.5.7"; + version = "4.6.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = "go-musicfox"; rev = "v${version}"; - hash = "sha256-x3j+gfPRPkDJq9dF2NZBqvRWhnthQ8Y1TUE6xV0qFVU="; + hash = "sha256-pzB57XeDD8lfJMkP9/k1rrszYXYYzQt2UekH2Atiqjw="; }; deleteVendor = true; - vendorHash = "sha256-ItZMt6LLOQ/ZRBKAGjD72cTzK39l/ffXpXbODm9MCh8="; + vendorHash = "sha256-IO/UlOW6pLZp6JaU5P9vUJ0qx0Srvmb5vjpX1pSdaeM="; subPackages = [ "cmd/musicfox.go" ]; From 2708aa06c09870ce9d6e5cd40d0c51372e914cc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 19:40:16 +0000 Subject: [PATCH 36/79] chirpstack-rest-api: 4.10.1 -> 4.10.2 --- pkgs/by-name/ch/chirpstack-rest-api/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 79d68a1c770c..cdc711873a36 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.10.1"; + version = "4.10.2"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-Rqxayn5vcCsvdztfElhRrdxxO3l5SgtckmWQMYey9MA="; + hash = "sha256-t7JACy26BzmkC7f/KGATw8V+lqEqhkPjEg6LHQ6REWE="; }; - vendorHash = "sha256-7Qcd7AQjIdp5j7/i7wEZslMiOR5/rJ0HGbo8o7Q035U="; + vendorHash = "sha256-Y4KGcLms5TAWHcvm9OYKty3+Lciycy+31zokVAPx/pI="; ldflags = [ "-s" From 38b6412dbd86541988d63b20c3b961ee6ceb20a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 19:49:16 +0000 Subject: [PATCH 37/79] chirpstack-concentratord: 4.4.2 -> 4.4.6 --- pkgs/by-name/ch/chirpstack-concentratord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix index 33ed88b0e13f..3f80f674047a 100644 --- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix +++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-concentratord"; - version = "4.4.2"; + version = "4.4.6"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-concentratord"; rev = "v${version}"; - hash = "sha256-UbUtNJuz8zfhHzyOiT/mRNtNRmdoNnuszrVSbLoVGK8="; + hash = "sha256-O5QevCYFZEJzZcLM3wh9b+RvbkFwLlvIcFhVbhVDOXU="; }; - cargoHash = "sha256-JXIyrbBRGJR9mjvawU46mBfGYxZPpYl9aB9k3WBA/co="; + cargoHash = "sha256-oRy8yGBRD/PGh+RtY9nk03oV6SRBGucRABwfgJbnuxM="; buildInputs = [ libloragw-2g4 From 874534752dfaaf28389506d14a77113c737cdcbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 21:14:15 +0100 Subject: [PATCH 38/79] python311Packages.xknx: 3.3.0 -> 3.4.0 Diff: https://github.com/XKNX/xknx/compare/refs/tags/3.3.0...3.4.0 Changelog: https://github.com/XKNX/xknx/releases/tag/3.4.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index eb3472bce0f9..9eb8b9330bf4 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-FLGOY7IUdLvRbwSWUYbJl0VzOCJVwiG+2C+CjFAqI6g="; + hash = "sha256-nCFIP4ZeO4pRmyh2BdE86Dg/0zKYR3izcc2MOzVC4/g="; }; build-system = [ setuptools ]; From 24421886f068e5f4adc7f33cd09a2a12114fea01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 21:23:09 +0100 Subject: [PATCH 39/79] cnspec: 11.33.1 -> 11.34.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.33.1...v11.34.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.34.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6cab660451e0..68d8bf381b97 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.33.1"; + version = "11.34.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-zMv2Um8pw5unoy6h2aApDLGWy2SSJjkD2bbqYi1AxKU="; + hash = "sha256-0JrtmDpe3T2kSjgAJxM8X/pJ/mF0E3Jjcv/e2yRyd4M="; }; proxyVendor = true; - vendorHash = "sha256-n9PdtuKHm6gqVudf49PakK6fChHZfiGYr9eTPkSBfV8="; + vendorHash = "sha256-Thc6FndsGfMHleglL2VtREnAjuuJs29qI+9+xNteRjU="; subPackages = [ "apps/cnspec" ]; From db77d3a248cda943fede7d1583604d4275afad60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 21:24:53 +0100 Subject: [PATCH 40/79] python312Packages.boto3-stubs: 1.35.76 -> 1.35.78 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8bd3465629c6..797a87d377a4 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.76"; + version = "1.35.78"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-MhCbagyXIL98LjiWVUecbatO4zxiLizydGyeXsUnuuM="; + hash = "sha256-XQI88fzHI9/bopZT4K2bmTOYXIE6JbwhgH4h6rgeIbQ="; }; build-system = [ setuptools ]; From 7090ee4e66b07aa0555a4d6dc05a64f1f1ad4d8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 21:24:56 +0100 Subject: [PATCH 41/79] python312Packages.botocore-stubs: 1.35.76 -> 1.35.78 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 231f69f75aee..b316201de42f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.76"; + version = "1.35.78"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-yXegSUgdUKFL8tsO8VAgt2c0/2KNS44Od7jRxlMYNp4="; + hash = "sha256-TLXB/KMwSKKvyiACcZqNaW9wUatPDvX17pbfeq92oFU="; }; nativeBuildInputs = [ setuptools ]; From 14d73ab1c8296c90a6c677932e65b76cb674a7a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 20:26:14 +0000 Subject: [PATCH 42/79] mosdepth: 0.3.9 -> 0.3.10 --- pkgs/by-name/mo/mosdepth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index 5c226a570d59..ab3a5dfab336 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -8,7 +8,7 @@ buildNimPackage (finalAttrs: { pname = "mosdepth"; - version = "0.3.9"; + version = "0.3.10"; requiredNimVersion = 1; @@ -16,7 +16,7 @@ buildNimPackage (finalAttrs: { owner = "brentp"; repo = "mosdepth"; rev = "v${finalAttrs.version}"; - hash = "sha256-vHJgIo9qO/L1lZ9DqgXVwv9Pn/6ZMOBfPsY4DEAEImI="; + hash = "sha256-RAE3k2yA2zsIr5JFYb5bPaMzdoEKms7TKaqVhPS5LzY="; }; lockFile = ./lock.json; From 0add05081f3319ada88a52bfb7b1c28ae0dcdc4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 00:06:51 +0100 Subject: [PATCH 43/79] home-assistant-custom-lovelace-modules: set up autocalling --- .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../bubble-card/{default.nix => package.nix} | 0 .../button-card/{default.nix => package.nix} | 0 .../card-mod/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../custom-lovelace-modules/default.nix | 52 ------------------- .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../mushroom/{default.nix => package.nix} | 0 .../rmv-card/{default.nix => package.nix} | 0 .../sankey-chart/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../vacuum-card/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../weather-card/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ++- 23 files changed, 4 insertions(+), 54 deletions(-) rename pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/button-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/{default.nix => package.nix} (100%) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/default.nix rename pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/apexcharts-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/button-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix deleted file mode 100644 index 8a51d530a0bf..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - pkgs, - callPackage, -}: - -{ - apexcharts-card = callPackage ./apexcharts-card { }; - - atomic-calendar-revive = callPackage ./atomic-calendar-revive { }; - - bubble-card = callPackage ./bubble-card { }; - - button-card = callPackage ./button-card { }; - - card-mod = callPackage ./card-mod { }; - - decluttering-card = callPackage ./decluttering-card { }; - - hourly-weather = callPackage ./hourly-weather { }; - - lg-webos-remote-control = callPackage ./lg-webos-remote-control { }; - - light-entity-card = callPackage ./light-entity-card { }; - - mini-graph-card = callPackage ./mini-graph-card { }; - - mini-media-player = callPackage ./mini-media-player { }; - - multiple-entity-row = callPackage ./multiple-entity-row { }; - - mushroom = callPackage ./mushroom { }; - - rmv-card = callPackage ./rmv-card { }; - - sankey-chart = callPackage ./sankey-chart { }; - - template-entity-row = callPackage ./template-entity-row { }; - - universal-remote-card = callPackage ./universal-remote-card { }; - - vacuum-card = callPackage ./vacuum-card { }; - - valetudo-map-card = callPackage ./valetudo-map-card { }; - - weather-card = callPackage ./weather-card { }; - - zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; -} -// lib.optionalAttrs pkgs.config.allowAliases { - android-tv-card = lib.warnOnInstantiate "`home-assistant-custom-lovelace-modules.android-tv-card` has been renamed to `universal-remote-card`" pkgs.home-assistant-custom-lovelace-modules.universal-remote-card; -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3c331d76a5f..5e835e45dd48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11602,8 +11602,10 @@ with pkgs; inherit (home-assistant.python.pkgs) callPackage; directory = ../servers/home-assistant/custom-components; }); - home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-lovelace-modules {}); + home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ../servers/home-assistant/custom-lovelace-modules; + }); home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; From e0f2595ed33e60380f8d43695972aad8c9b47be3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:06:04 +1000 Subject: [PATCH 44/79] zfs_2_2: 2.2.6 -> 2.2.7 Diff: https://github.com/openzfs/zfs/compare/zfs-2.2.6...zfs-2.2.7 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.7 --- pkgs/os-specific/linux/zfs/2_2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 96f4462f22bf..587c7bc8d96a 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -15,10 +15,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_2"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.11"; + kernelCompatible = kernel: kernel.kernelOlder "6.13"; # this package should point to the latest release. - version = "2.2.6"; + version = "2.2.7"; tests = { inherit (nixosTests.zfs) installer series_2_2; @@ -29,5 +29,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; + hash = "sha256-nFOB0/7YK4e8ODoW9A+RQDkZHG/isp2EBOE48zTaMP4="; } From 58567f642d533c1bb74f1db8fa1f0b0a45aad8fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 00:10:04 +0100 Subject: [PATCH 45/79] homee-assistant-custom-components: use dependencies The dependencies attribute is a bit more lightweight than propagatedBuildInputs and what we prefer in the Python ecosystem. --- pkgs/servers/home-assistant/custom-components/README.md | 4 ++-- .../custom-components/adaptive_lighting/package.nix | 2 +- .../home-assistant/custom-components/awtrix/package.nix | 2 +- .../home-assistant/custom-components/bodymiscale/package.nix | 2 +- .../home-assistant/custom-components/emporia_vue/package.nix | 2 +- .../home-assistant/custom-components/epex_spot/package.nix | 2 +- .../custom-components/garmin_connect/package.nix | 2 +- .../home-assistant/custom-components/govee-lan/package.nix | 2 +- .../servers/home-assistant/custom-components/gpio/package.nix | 2 +- .../custom-components/midea-air-appliances-lan/package.nix | 2 +- .../home-assistant/custom-components/moonraker/package.nix | 2 +- .../servers/home-assistant/custom-components/ntfy/package.nix | 2 +- .../custom-components/omnik_inverter/package.nix | 2 +- .../home-assistant/custom-components/sensi/package.nix | 2 +- .../home-assistant/custom-components/smartir/package.nix | 2 +- .../custom-components/smartthinq-sensors/package.nix | 2 +- .../custom-components/xiaomi_gateway3/package.nix | 2 +- .../home-assistant/custom-components/yassi/package.nix | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 238c320ba279..38b2346a4eab 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -8,7 +8,7 @@ It builds upon `buildPythonPackage` but uses a custom install and check phase. Python runtime dependencies can be directly consumed as unqualified -function arguments. Pass them into `propagatedBuildInputs`, for them to +function arguments. Pass them into `dependencies`, for them to be available to Home Assistant. Out-of-tree components need to use Python packages from @@ -31,7 +31,7 @@ buildHomeAssistantComponent { # owner, repo, rev, hash }; - propagatedBuildInputs = [ + dependencies = [ # python requirements, as specified in manifest.json ]; diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix index a60f6df2f2ef..15d3b19da7f4 100644 --- a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix +++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-Yq8mKk2j2CHyHvwyej0GeFQhuy1MFXwt0o+lDOGwrBU="; }; - propagatedBuildInputs = [ + dependencies = [ ulid-transform ]; diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/package.nix b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix index 79150e74b83b..0821e4645afe 100644 --- a/pkgs/servers/home-assistant/custom-components/awtrix/package.nix +++ b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-ucSaQWMS6ZwXHnw5Ct/STxpl1JjBRua3edrLvBAsdyw="; }; - propagatedBuildInputs = [ + dependencies = [ requests ]; diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix index e2b23891db94..cd73b339d2d3 100644 --- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix +++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix @@ -22,7 +22,7 @@ buildHomeAssistantComponent rec { substituteInPlace custom_components/bodymiscale/manifest.json --replace-fail 'cachetools==5.3.0' 'cachetools>=5.3.0' ''; - propagatedBuildInputs = [ + dependencies = [ cachetools ]; diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index 7c1e00e4cd91..0ec3e44e70ad 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-6NrRuBjpulT66pVUfW9ujULL5HSzfgyic1pKEBRupNA="; }; - propagatedBuildInputs = [ + dependencies = [ pyemvue ]; diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix index db8830b3cd53..ffa29f9a87c2 100644 --- a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-PY3udPgvsaXdDRh4+NQmVlqhERswcMpaJTq5azaUFf4="; }; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 ]; diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index 1ad5adfbd3bc..7c2ba13817c1 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -18,7 +18,7 @@ buildHomeAssistantComponent { hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI="; }; - propagatedBuildInputs = [ + dependencies = [ garminconnect tzlocal ]; diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix index 5443ae8e6b7c..abe5ba099588 100644 --- a/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix @@ -30,7 +30,7 @@ buildHomeAssistantComponent { dontBuild = true; - propagatedBuildInputs = [ + dependencies = [ govee-led-wez ]; diff --git a/pkgs/servers/home-assistant/custom-components/gpio/package.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix index aa61ae326b3c..a87bb0c1e5c8 100644 --- a/pkgs/servers/home-assistant/custom-components/gpio/package.nix +++ b/pkgs/servers/home-assistant/custom-components/gpio/package.nix @@ -18,7 +18,7 @@ buildHomeAssistantComponent rec { hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk="; }; - propagatedBuildInputs = [ libgpiod ]; + dependencies = [ libgpiod ]; meta = with lib; { description = "Home Assistant GPIO custom integration"; diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix index dd70412b6409..9195553ba62b 100644 --- a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-Fl8qwsW9NdjnYdu7IGQDelXTLqNx5ioUoxkhv+p5L0I="; }; - propagatedBuildInputs = [ midea-beautiful-air ]; + dependencies = [ midea-beautiful-air ]; meta = with lib; { description = "Home Assistant custom component adding support for controlling Midea air conditioners and dehumidifiers on local network"; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 452e84c4a039..84cdd06a9607 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-LGpCT0a6mxbf0W6ucTIBhl9aNUd5/1dUk6M+CzRKuoU="; }; - propagatedBuildInputs = [ + dependencies = [ moonraker-api ]; diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix index 39bebb70ada7..9ff55f87cc11 100644 --- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-OGCAJsAsnUjwaLR8lCBdU+ghVOGFF0mT73t5JtcngUA="; }; - propagatedBuildInputs = [ + dependencies = [ requests ]; diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix index 75e54c514354..e25ceef4f0ab 100644 --- a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix +++ b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-O1NxT7u27xLydPqEqH72laU0tlYVrMPo0TwWIVNJ+0Q="; }; - propagatedBuildInputs = [ + dependencies = [ omnikinverter ]; diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix index f8293518a51e..b653088c2bf6 100644 --- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-NbK9h0nvcWNSwsc04YgjqKl+InijxftPJ3SLCQF/Hns="; }; - propagatedBuildInputs = [ + dependencies = [ websockets ]; diff --git a/pkgs/servers/home-assistant/custom-components/smartir/package.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix index 876579639b64..6735dd530676 100644 --- a/pkgs/servers/home-assistant/custom-components/smartir/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smartir/package.nix @@ -29,7 +29,7 @@ buildHomeAssistantComponent rec { }) ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles broadlink ]; diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix index b4146bef9d01..daeb34c4adee 100644 --- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix @@ -19,7 +19,7 @@ buildHomeAssistantComponent rec { hash = "sha256-mcxXBnVGrlVxbSi+IwmGJiWqy5PlQmHQl+hgW6i7NFc="; }; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer pycountry xmltodict diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix index 22a68fa24062..2cf333603001 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix @@ -18,7 +18,7 @@ buildHomeAssistantComponent rec { hash = "sha256-0tLyRQ5KIL3NDAKK8nr8ZrgN/uh8YdGA7iSNJwEIxis="; }; - propagatedBuildInputs = [ zigpy ]; + dependencies = [ zigpy ]; dontBuild = true; diff --git a/pkgs/servers/home-assistant/custom-components/yassi/package.nix b/pkgs/servers/home-assistant/custom-components/yassi/package.nix index d2e6dc946fa2..50a81b463dbc 100644 --- a/pkgs/servers/home-assistant/custom-components/yassi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yassi/package.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-uhyUQebAx4g1PT/urbyx8EZNFE9vIY0bUAKmgCwY3aQ="; }; - propagatedBuildInputs = [ pysmartthings ]; + dependencies = [ pysmartthings ]; meta = with lib; { description = "HomeAssistant integration for Samsung Soundbars"; From ba5ed7f373963a185e9a44bda11d256a5922f036 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 00:22:13 +0100 Subject: [PATCH 46/79] buildHomeAssistantComponent: support components in src root --- .../home-assistant/build-custom-component/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index ccc869c52c22..b413da8bd91c 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -1,5 +1,4 @@ { - lib, home-assistant, makeSetupHook, }: @@ -21,13 +20,18 @@ in home-assistant.python.pkgs.buildPythonPackage ( { pname = "${owner}/${domain}"; - inherit format; + inherit version format; installPhase = '' runHook preInstall mkdir $out - cp -r ./custom_components/ $out/ + if [[ -f ./manifest.json ]]; then + mkdir $out/custom_components + cp -R $(realpath .) $out/custom_components/ + else + cp -r ./custom_components/ $out/ + fi # optionally copy sentences, if they exist cp -r ./custom_sentences/ $out/ || true From d65f8a2c324e6ef4d5941d0b131fe0a2d6899703 Mon Sep 17 00:00:00 2001 From: Andreas Pelme Date: Wed, 11 Dec 2024 20:40:14 +0100 Subject: [PATCH 47/79] buildbot: Remove broken on Darwin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems to me that buildbot is not broken on Darwin. This build failure was referenced from a comment: https://hydra.nixos.org/build/243534318/nixlog/6. I was able to successfully build, run and get a basic buildbot master, worker and web ui going on my aarch64-darwin machine: ``` ❯ nix run .#nix-info -- -m - system: `"aarch64-darwin"` - host os: `Darwin 24.0.0, macOS 15.0.1` - multi-user?: `no` - sandbox: `yes` - version: `nix-env (Lix, like Nix) 2.91.1 System type: aarch64-darwin Additional system types: Features: gc, signed-caches System configuration file: /etc/nix/nix.conf User configuration files: /Users/andreas/.config/nix/nix.conf:/etc/xdg/nix/nix.conf Store directory: /nix/store State directory: /nix/var/nix Data directory: /nix/store/1phn7b1smb3g9jqz7v39q13wlyji2msz-lix-2.91.1/share` - nixpkgs: `not found` ❯ nix build .#buildbot-full ❯ result/bin/buildbot create-master /tmp/my_master mkdir /tmp/my_master creating /tmp/my_master/master.cfg.sample creating database (sqlite:///state.sqlite) buildmaster configured in /tmp/my_master ❯ mv /tmp/my_master/master.cfg.sample /tmp/my_master/master.cfg ❯ result/bin/buildbot start /tmp/my_master Following twistd.log until startup finished.. The buildmaster appears to have (re)started correctly. ❯ nix build .#buildbot-worker ❯ result/bin/buildbot-worker create-worker /tmp/my_worker localhost example-worker pass mkdir /tmp/my_worker mkdir /tmp/my_worker/info Creating info/admin, you need to edit it appropriately. Creating info/host, you need to edit it appropriately. Not creating info/access_uri - add it if you wish Please edit the files in /tmp/my_worker/info appropriately. worker configured in /tmp/my_worker ❯ result/bin/buildbot-worker start /tmp/my_worker Following twistd.log until startup finished.. The buildbot-worker appears to have (re)started correctly. ``` --- .../development/tools/continuous-integration/buildbot/master.nix | 1 - .../development/tools/continuous-integration/buildbot/worker.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 6a8dc5b23790..e5bfb0f9c4cc 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -176,6 +176,5 @@ buildPythonApplication rec { changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = teams.buildbot.members; license = licenses.gpl2Only; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 0ecb0228e5d8..cfbc3b33f533 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -56,6 +56,5 @@ buildPythonPackage ({ description = "Buildbot Worker Daemon"; maintainers = teams.buildbot.members; license = licenses.gpl2; - broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; }) From 02816f87e444e971eb8d8b833601eb826df0dc43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 02:44:04 +0000 Subject: [PATCH 48/79] nhost-cli: 1.28.1 -> 1.28.2 --- pkgs/by-name/nh/nhost-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index 37a0cfd47483..1f96bf9bf592 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.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; tag = "v${version}"; - hash = "sha256-bktz8ummBML8y//KnAQsOzwX+OO3ntiUkw8RG3PnGXg="; + hash = "sha256-MnsF4/TCl3AwBsYkT6eMLyjKY+7WcRpXT0fl8hdP/pA="; }; vendorHash = null; From b2d6597ee47d0de82f59ff8df7f4d5f8b9589fc4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 01:39:09 +0100 Subject: [PATCH 49/79] buildHomeAssistantComponent: Increase manifest check robustness - Find and check all manifest files - Allow ignoring too tight version constraints --- .../build-custom-component/check_manifest.py | 77 ++++++++++++------- .../build-custom-component/default.nix | 1 - .../manifest-requirements-check-hook.nix | 2 +- .../manifest-requirements-check-hook.sh | 23 ++++-- .../custom-components/README.md | 18 +++++ 5 files changed, 86 insertions(+), 35 deletions(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py index a8fd9505e52f..c2a41584effc 100644 --- a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -1,19 +1,31 @@ #!/usr/bin/env python3 +import argparse import json import os import sys -import importlib_metadata +import importlib.metadata +from typing import Dict, List from packaging.requirements import InvalidRequirement, Requirement -def error(msg: str, ret: bool = False) -> None: +def error(msg: str, ret: bool = False) -> bool: print(f" - {msg}", file=sys.stderr) return ret -def check_requirement(req: str): +def check_derivation_name(manifest: Dict) -> bool: + derivation_domain = os.environ.get("domain") + manifest_domain = manifest["domain"] + if derivation_domain != manifest_domain: + return error( + f"Derivation attribute domain ({derivation_domain}) should match manifest domain ({manifest_domain})" + ) + return True + + +def test_requirement(req: str, ignore_version_requirement: List[str]) -> bool: # https://packaging.pypa.io/en/stable/requirements.html try: requirement = Requirement(req) @@ -21,44 +33,55 @@ def check_requirement(req: str): return error(f"{req} could not be parsed", ret=True) try: - version = importlib_metadata.distribution(requirement.name).version - except importlib_metadata.PackageNotFoundError: - return error(f"{requirement.name}{requirement.specifier} not present") + version = importlib.metadata.distribution(requirement.name).version + except importlib.metadata.PackageNotFoundError: + return error(f"{requirement.name}{requirement.specifier} not installed") # https://packaging.pypa.io/en/stable/specifiers.html - if version not in requirement.specifier: + if ( + requirement.name not in ignore_version_requirement + and version not in requirement.specifier + ): return error( - f"{requirement.name}{requirement.specifier} expected, but got {version}" + f"{requirement.name}{requirement.specifier} not satisfied by version {version}" ) return True -def check_manifest(manifest_file: str): - with open(manifest_file) as fd: - manifest = json.load(fd) - +def check_requirements(manifest: Dict, ignore_version_requirement: List[str]): ok = True - derivation_domain = os.environ.get("domain") - manifest_domain = manifest["domain"] - if derivation_domain != manifest_domain: - ok = False - error( - f"Derivation attribute domain ({derivation_domain}) must match manifest domain ({manifest_domain})" - ) + for requirement in manifest.get("requirements", []): + ok &= test_requirement(requirement, ignore_version_requirement) - if "requirements" in manifest: - for requirement in manifest["requirements"]: - ok &= check_requirement(requirement) + return ok + + +def main(args): + ok = True + + manifests = [] + for fd in args.manifests: + manifests.append(json.load(fd)) + + # At least one manifest should match the component name + ok &= any(check_derivation_name(manifest) for manifest in manifests) + + # All requirements need to match, use `ignoreRequirementVersion` to ignore too strict version constraints + ok &= all( + check_requirements(manifest, args.ignore_version_requirement) + for manifest in manifests + ) if not ok: - error("Manifest check failed.") sys.exit(1) if __name__ == "__main__": - if len(sys.argv) < 2: - raise RuntimeError(f"Usage {sys.argv[0]} ") - manifest_file = sys.argv[1] - check_manifest(manifest_file) + parser = argparse.ArgumentParser() + parser.add_argument("manifests", type=argparse.FileType("r"), nargs="+") + parser.add_argument("--ignore-version-requirement", action="append", default=[]) + args = parser.parse_args() + + main(args) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index b413da8bd91c..b951b076b75f 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -42,7 +42,6 @@ home-assistant.python.pkgs.buildPythonPackage ( nativeCheckInputs = with home-assistant.python.pkgs; [ - importlib-metadata manifestRequirementsCheckHook packaging ] diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix index ada031db22e6..757fcf33a633 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -4,7 +4,7 @@ }: makeSetupHook { - name = "manifest-requirements-check-hook"; + name = "manifest-check-hook"; substitutions = { pythonCheckInterpreter = python.interpreter; checkManifest = ./check_manifest.py; diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh index 1fb366d13b43..cfe61f4308a6 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh @@ -1,17 +1,28 @@ +# shellcheck shell=bash + # Setup hook to check HA manifest requirements -echo "Sourcing manifest-requirements-check-hook" +echo "Sourcing manifest-check-hook" function manifestCheckPhase() { echo "Executing manifestCheckPhase" runHook preCheck - manifests=$(shopt -s nullglob; echo $out/custom_components/*/manifest.json) + args="" + # shellcheck disable=SC2154 + for package in "${ignoreVersionRequirement[@]}"; do + args+=" --ignore-version-requirement ${package}" + done - if [ ! -z "$manifests" ]; then - echo Checking manifests $manifests - @pythonCheckInterpreter@ @checkManifest@ $manifests + readarray -d '' manifests < <(find . -type f -name "manifest.json" -print0) + + if [ "${#manifests[@]}" -gt 0 ]; then + # shellcheck disable=SC2068 + echo Checking manifests ${manifests[@]} + # shellcheck disable=SC2068,SC2086 + @pythonCheckInterpreter@ @checkManifest@ ${manifests[@]} $args else - echo "No custom component manifests found in $out" >&2 + # shellcheck disable=SC2154 + echo "No component manifests found in $out" >&2 exit 1 fi diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 38b2346a4eab..f868502b3261 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -72,3 +72,21 @@ and manifest agree about the domain name. There shouldn't be a need to disable this hook, but you can set `dontCheckManifest` to `true` in the derivation to achieve that. + +### Too narrow version constraints + +Every once in a while a dependency constraint is more narrow than it +needs to be. Instead of applying brittle substitions the version constraint +can be ignored on a per requirement basis. + +```nix + dependencies = [ + pyemvue + ]; + + # don't check the version constraint of pyemvue + ignoreVersionRequirement = [ + "pyemvue" + ]; +``` +` From bce4963de448c4a02401a565e98cf7af7b22eb3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:22:47 +0100 Subject: [PATCH 50/79] home-assistant-custom-components: migrate to ignoreVersionRequirement --- .../custom-components/bodymiscale/package.nix | 8 ++++---- .../custom-components/emporia_vue/package.nix | 6 +++--- .../philips_airpurifier_coap/package.nix | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix index cd73b339d2d3..ba19b714ae4c 100644 --- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix +++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix @@ -18,14 +18,14 @@ buildHomeAssistantComponent rec { hash = "sha256-6bYKqU9yucISjTrmCUx1bNn9kqvT9jW1OBrqAa4ayEQ="; }; - postPatch = '' - substituteInPlace custom_components/bodymiscale/manifest.json --replace-fail 'cachetools==5.3.0' 'cachetools>=5.3.0' - ''; - dependencies = [ cachetools ]; + ignoreVersionRequirement = [ + "cachetools" + ]; + meta = { description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2"; homepage = "https://github.com/dckiller51/bodymiscale"; diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index 0ec3e44e70ad..79f421d43ac1 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -21,9 +21,9 @@ buildHomeAssistantComponent rec { pyemvue ]; - postPatch = '' - substituteInPlace custom_components/emporia_vue/manifest.json --replace-fail 'pyemvue==0.17.1' 'pyemvue>=0.17.1' - ''; + ignoreVersionRequirement = [ + "pyemvue" + ]; dontBuild = true; diff --git a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix index 8681adeccc3e..f2cb6dd23e29 100644 --- a/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix +++ b/pkgs/servers/home-assistant/custom-components/philips_airpurifier_coap/package.nix @@ -19,15 +19,15 @@ buildHomeAssistantComponent rec { hash = "sha256-yoaph/R3c4j+sXEC02Hv+ixtuif70/y6Gag5NBpKFLs="; }; - postPatch = '' - substituteInPlace custom_components/philips_airpurifier_coap/manifest.json --replace-fail 'getmac==0.9.4' 'getmac>=0.9.4' - ''; - dependencies = [ aioairctrl getmac ]; + ignoreVersionRequirement = [ + "getmac" + ]; + meta = { description = "Philips AirPurifier custom component for Home Assistant"; homepage = "https://github.com/kongo09/philips-airpurifier-coap"; From f88773fd8056566120ef23dc3407d4957b7a855b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:23:09 +0100 Subject: [PATCH 51/79] home-assistant-custom-components.emporia_vue: fix owner attribute You are the maintainer, no the owner of the component. --- .../home-assistant/custom-components/emporia_vue/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index 79f421d43ac1..8cf60a5b67f6 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -6,7 +6,7 @@ }: buildHomeAssistantComponent rec { - owner = "presto8"; + owner = "magico13"; domain = "emporia_vue"; version = "0.8.3"; From 31a85b9115990db5d4bb0c59347e16a688dabaa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:23:52 +0100 Subject: [PATCH 52/79] home-assistant-custom-component.alarmo: clean up in patch phase --- .../home-assistant/custom-components/alarmo/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix index ace6633a8c6e..be9a7de1b19e 100644 --- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix @@ -9,11 +9,6 @@ buildHomeAssistantComponent rec { domain = "alarmo"; version = "1.10.4"; - postInstall = '' - cd $out/custom_components/alarmo/frontend - ls . | grep -v dist | xargs rm -rf - ''; - src = fetchFromGitHub { owner = "nielsfaber"; repo = "alarmo"; @@ -21,6 +16,10 @@ buildHomeAssistantComponent rec { hash = "sha256-/hNzGPckLHUX0mrBF3ugAXstrOc1mWdati+nRJCwldc="; }; + postPatch = '' + find ./custom_components/alarmo/frontend -mindepth 1 -maxdepth 1 ! -name "dist" -exec rm -rf {} \; + ''; + meta = with lib; { changelog = "https://github.com/nielsfaber/alarmo/releases/tag/v${version}"; description = "Alarm System for Home Assistant"; From 86fff9e3bf8f07f563468853c55e02a672ad43dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:31:59 +0100 Subject: [PATCH 53/79] buildHomeAssistantComponent: make build quieter - We generally don't need a buildPhase - Copy custom_sentences only if they exist --- .../home-assistant/build-custom-component/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index b951b076b75f..02f1d01a1170 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -22,6 +22,10 @@ home-assistant.python.pkgs.buildPythonPackage ( pname = "${owner}/${domain}"; inherit version format; + buildPhase = '' + true + ''; + installPhase = '' runHook preInstall @@ -34,7 +38,9 @@ home-assistant.python.pkgs.buildPythonPackage ( fi # optionally copy sentences, if they exist - cp -r ./custom_sentences/ $out/ || true + if [[ -d ./custom_sentences ]]; then + cp -r ./custom_sentences/ $out/ + fi runHook postInstall ''; From d556120bcc66a501cfbcd1bb86f5291d6fe23edb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:44:49 +0100 Subject: [PATCH 54/79] home-assistant-lovelace-modules.weather-chard-card: init at 2.4.11 --- .../weather-chart-card/package-lock.json | 2165 +++++++++++++++++ .../weather-chart-card/package.nix | 41 + 2 files changed, 2206 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package-lock.json create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package-lock.json b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package-lock.json new file mode 100644 index 000000000000..7d5cfc79c0e5 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package-lock.json @@ -0,0 +1,2165 @@ +{ + "name": "weather-chart-card", + "version": "1.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "weather-chart-card", + "version": "1.0.1", + "license": "MIT", + "dependencies": { + "chart.js": "^4.4.1", + "chartjs-plugin-datalabels": "^2.2.0", + "lit": "^2.8.0", + "relative-time": "^1.0.0" + }, + "devDependencies": { + "eslint": "^8.56.0", + "rollup": "^4.9.6", + "rollup-plugin-copy": "^3.5.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-serve": "^2.0.3" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@kurkle/color": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz", + "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==", + "license": "MIT" + }, + "node_modules/@lit-labs/ssr-dom-shim": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.1.tgz", + "integrity": "sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@lit/reactive-element": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.3.tgz", + "integrity": "sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.0.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz", + "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz", + "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz", + "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz", + "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz", + "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz", + "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz", + "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz", + "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz", + "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz", + "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz", + "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz", + "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz", + "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz", + "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz", + "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz", + "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz", + "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz", + "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz", + "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/fs-extra": { + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz", + "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.10.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", + "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@types/resolve": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", + "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "license": "MIT" + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz", + "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==", + "dev": true, + "license": "ISC" + }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chart.js": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.7.tgz", + "integrity": "sha512-pwkcKfdzTMAU/+jNosKhNL2bHtJc/sSmYgVbuGTEDhzkrhmyihmP7vUc/5ZK9WopidMDHNe3Wm7jOd/WhuHWuw==", + "license": "MIT", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=8" + } + }, + "node_modules/chartjs-plugin-datalabels": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz", + "integrity": "sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==", + "license": "MIT", + "peerDependencies": { + "chart.js": ">=3.0.0" + } + }, + "node_modules/cldrjs": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.5.tgz", + "integrity": "sha512-KDwzwbmLIPfCgd8JERVDpQKrUUM1U4KpFJJg2IROv89rF172lLufoJnqJ/Wea6fXL5bO6WjuLMzY8V52UWPvkA==" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/colorette": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-walker": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", + "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "dev": true, + "license": "ISC" + }, + "node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globalize": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.7.0.tgz", + "integrity": "sha512-faR46vTIbFCeAemyuc9E6/d7Wrx9k2ae2L60UhakztFg6VuE42gENVJNuPFtt7Sdjrk9m2w8+py7Jj+JTNy59w==", + "license": "MIT", + "dependencies": { + "cldrjs": "^0.5.4" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz", + "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz", + "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lit": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz", + "integrity": "sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit/reactive-element": "^1.6.0", + "lit-element": "^3.3.0", + "lit-html": "^2.8.0" + } + }, + "node_modules/lit-element": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.3.3.tgz", + "integrity": "sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.1.0", + "@lit/reactive-element": "^1.3.0", + "lit-html": "^2.8.0" + } + }, + "node_modules/lit-html": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz", + "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==", + "license": "BSD-3-Clause", + "dependencies": { + "@types/trusted-types": "^2.0.2" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/opener": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", + "dev": true, + "license": "(WTFPL OR MIT)", + "bin": { + "opener": "bin/opener-bin.js" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/relative-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/relative-time/-/relative-time-1.0.0.tgz", + "integrity": "sha512-nmG1az4PhB8JyMmywuyNHaaO4PeTCB8OoNxuaBBV1Wl8AH2QgjYEmL16iI4iRRx2PedA8il613Cqcm5phvvteg==", + "license": "MIT", + "dependencies": { + "globalize": "^1.1.1", + "zoned-date-time": "^1.0.0" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rollup": { + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz", + "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.6" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.28.1", + "@rollup/rollup-android-arm64": "4.28.1", + "@rollup/rollup-darwin-arm64": "4.28.1", + "@rollup/rollup-darwin-x64": "4.28.1", + "@rollup/rollup-freebsd-arm64": "4.28.1", + "@rollup/rollup-freebsd-x64": "4.28.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.28.1", + "@rollup/rollup-linux-arm-musleabihf": "4.28.1", + "@rollup/rollup-linux-arm64-gnu": "4.28.1", + "@rollup/rollup-linux-arm64-musl": "4.28.1", + "@rollup/rollup-linux-loongarch64-gnu": "4.28.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1", + "@rollup/rollup-linux-riscv64-gnu": "4.28.1", + "@rollup/rollup-linux-s390x-gnu": "4.28.1", + "@rollup/rollup-linux-x64-gnu": "4.28.1", + "@rollup/rollup-linux-x64-musl": "4.28.1", + "@rollup/rollup-win32-arm64-msvc": "4.28.1", + "@rollup/rollup-win32-ia32-msvc": "4.28.1", + "@rollup/rollup-win32-x64-msvc": "4.28.1", + "fsevents": "~2.3.2" + } + }, + "node_modules/rollup-plugin-copy": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz", + "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/fs-extra": "^8.0.1", + "colorette": "^1.1.0", + "fs-extra": "^8.1.0", + "globby": "10.0.1", + "is-plain-object": "^3.0.0" + }, + "engines": { + "node": ">=8.3" + } + }, + "node_modules/rollup-plugin-node-resolve": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz", + "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==", + "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-node-resolve.", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/resolve": "0.0.8", + "builtin-modules": "^3.1.0", + "is-module": "^1.0.0", + "resolve": "^1.11.1", + "rollup-pluginutils": "^2.8.1" + }, + "peerDependencies": { + "rollup": ">=1.11.0" + } + }, + "node_modules/rollup-plugin-serve": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/rollup-plugin-serve/-/rollup-plugin-serve-2.0.3.tgz", + "integrity": "sha512-gQKmfQng17+jOsX5tmDanvJkm0f9XLqWVvXsD7NGd1SlneT+U1j/HjslDUXQz6cqwLnVDRc6xF2lj6rre+eeeQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime": "^3", + "opener": "1" + } + }, + "node_modules/rollup-pluginutils": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", + "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "estree-walker": "^0.6.1" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zoned-date-time": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/zoned-date-time/-/zoned-date-time-1.1.0.tgz", + "integrity": "sha512-MhjAUwM1ABOmE9J5SzjNnoXQL83NDaZbRYsZtVTTIjKxXeGJ70GZNEC/NJAyhYiyFiteu24N8Q6gaGhOI/A51A==", + "license": "MIT" + } + } +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package.nix new file mode 100644 index 000000000000..31f1d92f9541 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-chart-card/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + fetchNpmDeps, +}: + +buildNpmPackage rec { + pname = "weather-chart-card"; + version = "2.4.11"; + + src = fetchFromGitHub { + owner = "mlamberts78"; + repo = "weather-chart-card"; + rev = "V${version}"; + hash = "sha256-JF7+XataMdUIGXfonF4XlZGitY9kqKony/U0/yw5jUA="; + }; + + postPatch = '' + rm -rf dist + ln -s ${./package-lock.json} ./package-lock.json + ''; + + npmDeps = fetchNpmDeps { + inherit src postPatch; + hash = "sha256-OJF8N7vPLRX0ec5gaQKAxLR227uoeuAU5z+QVNyOeTY="; + }; + + installPhase = '' + mkdir $out + cp -R dist/* $out/ + ''; + + meta = { + description = "Custom weather card with charts"; + homepage = "https://github.com/mlamberts78/weather-chart-card"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.all; + }; +} From c96b349fcbd5735ede2feb74f1e80c7ff4c5be56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:53:30 +0100 Subject: [PATCH 55/79] home-assistant-custom-components.alarmo: 1.10.4 -> 1.10.7 https://github.com/nielsfaber/alarmo/releases/tag/v1.10.7 --- .../home-assistant/custom-components/alarmo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix index be9a7de1b19e..9e882f22b6dc 100644 --- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix +++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "nielsfaber"; domain = "alarmo"; - version = "1.10.4"; + version = "1.10.7"; src = fetchFromGitHub { owner = "nielsfaber"; repo = "alarmo"; rev = "refs/tags/v${version}"; - hash = "sha256-/hNzGPckLHUX0mrBF3ugAXstrOc1mWdati+nRJCwldc="; + hash = "sha256-EFR8GveMNpwhrIA0nP+Ny3YUTHAOFw+IF72hH1+wMSM="; }; postPatch = '' From 8fcc2a1e57b0d6a835c09d651b8b4c70bf6cb188 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:53:50 +0100 Subject: [PATCH 56/79] home-assistant-custom-components.auth-header: 1.10-unstable-2024-02-26 -> 1.11 https://github.com/BeryJu/hass-auth-header/releases/tag/v1.11 --- .../custom-components/auth-header/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix index e5ccefc1ffc4..0d8283d5ef5d 100644 --- a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix +++ b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix @@ -7,19 +7,17 @@ buildHomeAssistantComponent rec { owner = "BeryJu"; domain = "auth_header"; - version = "1.10-unstable-2024-02-26"; + version = "1.11"; src = fetchFromGitHub { inherit owner; repo = "hass-auth-header"; - rev = "5923cb33b57a9d3c23513d54cc74b02ebd243409"; - hash = "sha256-ZYd1EduzoljaY3OnpjsKEAwtf03435zJmZtgqzbdjjA="; + tag = "v${version}"; + hash = "sha256-N2jEFyb/OWsO48rAuQBDHtQ5yKfIrGTcwlEb2P3LyVc="; }; - # build step just runs linter - dontBuild = true; - meta = with lib; { + changelog = "https://github.com/BeryJu/hass-auth-header/releases/tag/v${version}"; description = "Home Assistant custom component which allows you to delegate authentication to a reverse proxy"; homepage = "https://github.com/BeryJu/hass-auth-header"; maintainers = with maintainers; [ mjm ]; From 6bc9bb876e5198657f76064a16274d2853f7797a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 02:58:23 +0100 Subject: [PATCH 57/79] home-assistant-custom-components.average: 2.3.4 -> 2.4.0 https://github.com/Limych/ha-average/releases/tag/2.4.0 --- .../custom-components/average/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/average/package.nix b/pkgs/servers/home-assistant/custom-components/average/package.nix index be381233a116..8c7e92d3e59c 100644 --- a/pkgs/servers/home-assistant/custom-components/average/package.nix +++ b/pkgs/servers/home-assistant/custom-components/average/package.nix @@ -7,16 +7,21 @@ buildHomeAssistantComponent rec { owner = "Limych"; domain = "average"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { inherit owner; repo = "ha-average"; - rev = version; - hash = "sha256-PfN2F1/ScVScXfh5jKQDZ6rK4XlqD9+YW8k4f4i3bk0="; + tag = version; + hash = "sha256-LISGpgfoVxdOeJ9LHzxf7zt49pbIJrLiPkNg/Mf1lxM="; }; + postPatch = '' + sed -i "/pip>=/d" custom_components/average/manifest.json + ''; + meta = with lib; { + changelog = "https://github.com/Limych/ha-average/releases/tag/${version}"; description = "Average Sensor for Home Assistant"; homepage = "https://github.com/Limych/ha-average"; maintainers = with maintainers; [ matthiasbeyer ]; From 64dd5c39166f95cb477625b769798f43cd2617f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:01:32 +0100 Subject: [PATCH 58/79] home-assistant-custom-components.awtrix: 2024-05-26 -> 0.3.21 --- .../home-assistant/custom-components/awtrix/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/package.nix b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix index 0821e4645afe..afe9a0c71c88 100644 --- a/pkgs/servers/home-assistant/custom-components/awtrix/package.nix +++ b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix @@ -8,13 +8,14 @@ buildHomeAssistantComponent rec { owner = "10der"; domain = "awtrix"; - version = "unstable-2024-05-26"; + version = "0.3.21"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-custom_components-awtrix"; - rev = "329d8eec28478574b9f34778f96b5768f30be2ab"; - hash = "sha256-ucSaQWMS6ZwXHnw5Ct/STxpl1JjBRua3edrLvBAsdyw="; + # https://github.com/10der/homeassistant-custom_components-awtrix/issues/9 + rev = "8180cef7b1837e85115ef7ece553e39b0f94ff4d"; + hash = "sha256-D/RXi7nX+xqFs5Dvu1pwomQWCJ8PJhc1H3wsAgBhRMQ="; }; dependencies = [ From b2f1554aa501d660b3b522725ec3cadfccdcc257 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:03:01 +0100 Subject: [PATCH 59/79] home-assistant-custom-components.elevenlabs_tts: 2.3.0 -> 2.4.0 https://github.com/carleeno/elevenlabs_tts/releases/tag/2.4.0 --- .../custom-components/elevenlabs_tts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix index f69117f21547..11b95d1d284c 100644 --- a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix +++ b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "carleeno"; domain = "elevenlabs_tts"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "carleeno"; repo = "elevenlabs_tts"; rev = "refs/tags/${version}"; - hash = "sha256-7/Di3K7b0IzxatqBXqgVeMziRwalOVmIJ5IuEWJVjkE="; + hash = "sha256-/hszK5J1iGB46WfmCCK9/F0JOR405gplMwVC4niAqig="; }; meta = with lib; { From e74284a8d95fa677eb5096ee91a48d16d8292b4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:03:24 +0100 Subject: [PATCH 60/79] home-assistant-custom-components.emporia_vue: 0.8.3 -> 0.10.0 https://github.com/magico13/ha-emporia-vue/releases/tag/v0.10.0 --- .../home-assistant/custom-components/emporia_vue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index 8cf60a5b67f6..a20253be3c6c 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "magico13"; domain = "emporia_vue"; - version = "0.8.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "magico13"; repo = "ha-emporia-vue"; rev = "v${version}"; - hash = "sha256-6NrRuBjpulT66pVUfW9ujULL5HSzfgyic1pKEBRupNA="; + hash = "sha256-bUfFRcVu/i6yp9BbfM3d6J8TBT3X35HNk0tr00JIwC8="; }; dependencies = [ From bea43dc37fee429440c13b5857e2329ffbef2cd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:05:08 +0100 Subject: [PATCH 61/79] home-assistant-custom-components.frigate: 5.3.0 -> 5.4.0 https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.4.0 --- .../home-assistant/custom-components/frigate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index e54cab3c6e4a..11a7d1fcd93a 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "blakeblackshear"; domain = "frigate"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "blakeblackshear"; repo = "frigate-hass-integration"; rev = "v${version}"; - hash = "sha256-0eTEgRDgm4+Om2uqrt24Gj7dSdA6OJs/0oi5J5SHOyI="; + hash = "sha256-V2Y+xUAA/Lu7u82WUlUI5CFi9SGWe6ocVQtlXeVg2ZA="; }; dependencies = [ pytz ]; From a331e2f3e43dd923ba9109edb3ff30b3aea692a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:06:40 +0100 Subject: [PATCH 62/79] home-assistant-custom-components.garmin_connect: unstable-2024-08-31 -> 0.2.22 https://github.com/cyberjunky/home-assistant-garmin_connect/compare/d42edcabc67ba6a7f960e849c8aaec1aabef87c0...0.2.22 --- .../home-assistant/custom-components/garmin_connect/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index 7c2ba13817c1..1c38cb012500 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -9,7 +9,7 @@ buildHomeAssistantComponent { owner = "cyberjunky"; domain = "garmin_connect"; - version = "unstable-2024-08-31"; + version = "0.2.22"; src = fetchFromGitHub { owner = "cyberjunky"; From 37a9f73b673522b10e7b2da844ecd91890707188 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:07:21 +0100 Subject: [PATCH 63/79] home-assistant-custom-components.indego: 5.7.4 -> 5.7.8 https://github.com/sander1988/Indego/releases/tag/5.7.8 --- .../home-assistant/custom-components/indego/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/indego/package.nix b/pkgs/servers/home-assistant/custom-components/indego/package.nix index 6f185dd718c5..5e30d6f763a6 100644 --- a/pkgs/servers/home-assistant/custom-components/indego/package.nix +++ b/pkgs/servers/home-assistant/custom-components/indego/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "sander1988"; domain = "indego"; - version = "5.7.4"; + version = "5.7.8"; src = fetchFromGitHub { owner = "sander1988"; repo = "Indego"; rev = "refs/tags/${version}"; - hash = "sha256-SiYjducy0NP5bF3STVzhBdnJraNjHywHfD7OmAnYmr0="; + hash = "sha256-7PQUsSPS+o5Vt4Do4/TXyGXAqyHJg96w8n7UMpZ0uFo="; }; dependencies = [ pyindego ]; From ca3ef6810436d299f588e9bbc3395bc7ca10a22d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:07:51 +0100 Subject: [PATCH 64/79] home-assistant-custom-components.midea_ac: 2024.9.2 -> 2024.10.4 https://github.com/mill1000/midea-ac-py/compare/2024.9.2...2024.10.4 --- .../home-assistant/custom-components/midea_ac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index f188355099f9..14937422ef91 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2024.9.2"; + version = "2024.10.4"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; rev = version; - hash = "sha256-PVR3yuyWMilmyOS341pS73c9ocOrFfJ9dwiKEYqCtM4="; + hash = "sha256-P/s8HMP9xQWI+bgy6JHe4pAx+jItpK6BCWIyKsfTjmg="; }; dependencies = [ msmart-ng ]; From a1e9c6fa33111352b64aa17ebac0165cdc7bda31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:09:20 +0100 Subject: [PATCH 65/79] home-assistant-custom-components.sensi: 1.3.4 -> 1.3.14 https://github.com/iprak/sensi/releases/tag/v1.3.14 --- .../home-assistant/custom-components/sensi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix index b653088c2bf6..a2a81aab477c 100644 --- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "iprak"; domain = "sensi"; - version = "1.3.4"; + version = "1.3.14"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/v${version}"; - hash = "sha256-NbK9h0nvcWNSwsc04YgjqKl+InijxftPJ3SLCQF/Hns="; + hash = "sha256-kskffpfxpUjNUgsGc/sSkCbGdjt47KfPpH6KBFDLsHw="; }; dependencies = [ From 816e61165fc34d1b47145a8dcb87537259a3afce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:10:13 +0100 Subject: [PATCH 66/79] home-assistant-custom-components.spook: 3.0.1 -> 3.1.0 https://github.com/frenck/spook/releases/tag/v3.1.0 --- .../home-assistant/custom-components/spook/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/spook/package.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix index c93844570c22..3b6db52cb4d7 100644 --- a/pkgs/servers/home-assistant/custom-components/spook/package.nix +++ b/pkgs/servers/home-assistant/custom-components/spook/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "frenck"; domain = "spook"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/v${version}"; - hash = "sha256-ChHsevryWuim8BEFqXVkCOW9fGMrt5vol+B2SreMUws="; + hash = "sha256-IV3n++uFSOvQANPfbCeBj3GP0CCL+w9icKp/k5VO3Qg="; }; patches = [ ./remove-sub-integration-symlink-hack.patch ]; From e354b144199ca8f4706107affe26e39be35d0d79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:10:50 +0100 Subject: [PATCH 67/79] home-assistant-custom-components.tuya_local: 2024.8.0 -> 2024.11.4 https://github.com/make-all/tuya-local/releases/tag/2024.11.4 --- .../home-assistant/custom-components/tuya_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index e4d4387d82fb..776ff1b423d1 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2024.8.0"; + version = "2024.11.4"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; rev = "refs/tags/${version}"; - hash = "sha256-IHTWcNxmNXJk7SNnrLNFbaXJQSg6VYkAgAVmyt3JmRw="; + hash = "sha256-Mmcq0GBWiE6IWUVL6q9lw29wKEymAQn439/pOSqWgdQ="; }; dependencies = [ From adac140ebfe663450c08800ffe2dcad595f90bd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:11:13 +0100 Subject: [PATCH 68/79] home-assistant-custom-components.volkswagen_we_connect_id: 0.2.0 -> 0.2.3 https://github.com/mitch-dc/volkswagen_we_connect_id/releases/tag/v0.2.3 --- .../custom-components/volkswagen_we_connect_id/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix index b87b8c7aa738..90d8879a294a 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "mitch-dc"; domain = "volkswagen_we-connect_id"; - version = "0.2.0"; + version = "0.2.3"; src = fetchFromGitHub { inherit owner; repo = "volkswagen_we_connect_id"; rev = "refs/tags/v${version}"; - hash = "sha256-Pmx1jXWXYta/kY51Ih1YRB+QeIfklVvBKcUYU5bHbsQ="; + hash = "sha256-hok1ICAHMfvfMucBYkgWD68Tsn9E33Z/ouoRwFqHHF4="; }; dependencies = [ From 377ce0abc4d858396a926c4b047904aa4409b046 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:11:35 +0100 Subject: [PATCH 69/79] home-assistant-custom-components.waste_collection_schedule: 2.4.0 -> 2.5.0 https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.5.0 --- .../custom-components/waste_collection_schedule/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix index a51f827456d1..782143835849 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_waste_collection_schedule"; rev = "refs/tags/${version}"; - hash = "sha256-2WUwUifRCIhz+QmhpY8VGx/USEImpPX0K511xDJWP1I="; + hash = "sha256-8AUaVcVCZ+WCLrmEQhIEohEWmeG6g7t3EjVdF9FUyJQ="; }; dependencies = [ From a70e07b017a72ddd3478c94ad48c1b4a9cbe60c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 03:11:53 +0100 Subject: [PATCH 70/79] home-assistant-custom-components.xiaomi_miot: 0.7.23 -> 1.0.2 https://github.com/al-one/hass-xiaomi-miot/releases/tag/v1.0.2 --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 005284c76b6a..2231c998d28a 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "0.7.23"; + version = "1.0.2"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-PTjkKuK+DAOmKREr0AHjFXzy4ktguD4ZOHcWuLedLH0="; + hash = "sha256-WoPzWCraTj0VNzwZT9IpK7Loc1OuoQf/2B++SwP7f0Y="; }; dependencies = [ From cf0eaadb8606075a9100d75333f668bd506f39c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Dec 2024 04:02:21 +0100 Subject: [PATCH 71/79] python312Packages.msmart-ng: 2024.9.0 -> 2024.12.0 https://github.com/mill1000/midea-msmart/releases/tag/2024.12.0 --- pkgs/development/python-modules/msmart-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix index 0612e47799d4..b196369a73de 100644 --- a/pkgs/development/python-modules/msmart-ng/default.nix +++ b/pkgs/development/python-modules/msmart-ng/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "msmart-ng"; - version = "2024.9.0"; + version = "2024.12.0"; pyproject = true; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-msmart"; rev = version; - hash = "sha256-djo+sINurnrt0GO8045bgNstjh+yl+CE2GJ1vWivAqY="; + hash = "sha256-0Eh7QgR3IbTVa4kZ/7mtdmghFJLKOHpUawjMAoVuNoo="; }; build-system = [ From 7f8278a2640dd74794550ba4c99e851f4b74c5a2 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 24 Sep 2024 22:02:03 -0400 Subject: [PATCH 72/79] nixos/zfs: do not auto-import pools marked noauto This requires all datasets for the pool specified in `fileSystems` to be marked noauto. Note that this implicitly skips some tasks for the pool, such as `expandOnBoot`, as the pool will not be imported at that time. --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/tasks/filesystems/zfs.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f3a58367e055..79ab29de8162 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -91,6 +91,8 @@ 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more details. +- The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot. + - `nodePackages.stackdriver-statsd-backend` has been removed, as the StackDriver service has been discontinued by Google, and therefore the package no longer works. - the notmuch vim plugin now lives in a separate output of the `notmuch` diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c07a09d701f6..27f2028a175d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -128,7 +128,9 @@ let "systemd-modules-load.service" "systemd-ask-password-console.service" ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target"; - requiredBy = getPoolMounts prefix pool ++ [ "zfs-import.target" ]; + requiredBy = let + noauto = lib.all (fs: lib.elem "noauto" fs.options) (getPoolFilesystems pool); + in getPoolMounts prefix pool ++ lib.optional (!noauto) "zfs-import.target"; before = getPoolMounts prefix pool ++ [ "shutdown.target" "zfs-import.target" ]; conflicts = [ "shutdown.target" ]; unitConfig = { From 94b321638afed597e9bb528d45441c3fbfee2662 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Dec 2024 07:13:03 +0100 Subject: [PATCH 73/79] =?UTF-8?q?coqPackages.ExtLib:=200.12.2=20=E2=86=92?= =?UTF-8?q?=200.13.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/ExtLib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix index 398185396f3a..7d81235799e3 100644 --- a/pkgs/development/coq-modules/ExtLib/default.nix +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation rec { pname = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.20"; out = "0.12.2"; } + { case = range "8.14" "8.20"; out = "0.13.0"; } { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -13,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.13.0".sha256 = "sha256-vqVSu+nyGjRVXe2tnE6MPl0kcg4LHfgFwRCpTQAP/is="; release."0.12.2".sha256 = "sha256-lSTlbpkSuAY6B9cqofXSlDk2VchtqfZpRQ0+y/BAbEY="; release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; From 68891efe67f46ebbe4a584ae7d7a4c1fb7e8fbc6 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Thu, 12 Dec 2024 06:12:54 +0100 Subject: [PATCH 74/79] marytts: init at 5.2.1-unstable-2024-10-09, nixos/marytts: init (#351933) * marytts: init at 5.2.1-unstable-2024-10-09 * nixos/marytts: init module * nixos/marytts: add tests --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/marytts.nix | 184 ++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/marytts.nix | 87 ++++ pkgs/by-name/ma/marytts/deps.json | 405 ++++++++++++++++++ pkgs/by-name/ma/marytts/package.nix | 70 +++ 7 files changed, 750 insertions(+) create mode 100644 nixos/modules/services/audio/marytts.nix create mode 100644 nixos/tests/marytts.nix create mode 100644 pkgs/by-name/ma/marytts/deps.json create mode 100644 pkgs/by-name/ma/marytts/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 15bf3f9aeac0..29a0e96697ea 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -18,6 +18,8 @@ - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). +- [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts). + - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable). - [crab-hole](https://github.com/LuckyTurtleDev/crab-hole), a cross platform Pi-hole clone written in Rust using hickory-dns/trust-dns. Available as [services.crab-hole](#opt-services.crab-hole.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 245ffeb5cf8b..59788ba3a9a5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -395,6 +395,7 @@ ./services/audio/jack.nix ./services/audio/jmusicbot.nix ./services/audio/liquidsoap.nix + ./services/audio/marytts.nix ./services/audio/mopidy.nix ./services/audio/mpd.nix ./services/audio/mpdscribble.nix diff --git a/nixos/modules/services/audio/marytts.nix b/nixos/modules/services/audio/marytts.nix new file mode 100644 index 000000000000..8409b64bd371 --- /dev/null +++ b/nixos/modules/services/audio/marytts.nix @@ -0,0 +1,184 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.marytts; + format = pkgs.formats.javaProperties { }; +in +{ + options.services.marytts = { + enable = lib.mkEnableOption "MaryTTS"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + }; + default = { }; + description = '' + Settings for MaryTTS. + + See the [default settings](https://github.com/marytts/marytts/blob/master/marytts-runtime/conf/marybase.config) + for a list of possible keys. + ''; + }; + + package = lib.mkPackageOption pkgs "marytts" { }; + + basePath = lib.mkOption { + type = lib.types.path; + default = "/var/lib/marytts"; + description = '' + The base path in which MaryTTS runs. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 59125; + description = '' + Port to bind the MaryTTS server to. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Whether to open the port in the firewall for MaryTTS. + ''; + }; + + voices = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + example = lib.literalExpression '' + [ + (pkgs.fetchzip { + url = "https://github.com/marytts/voice-bits1-hsmm/releases/download/v5.2/voice-bits1-hsmm-5.2.zip"; + hash = "sha256-1nK+qZxjumMev7z5lgKr660NCKH5FDwvZ9sw/YYYeaA="; + }) + ] + ''; + description = '' + Paths to the JAR files that contain additional voices for MaryTTS. + + Voices are automatically detected by MaryTTS, so there is no need to alter + your config to make use of new voices. + ''; + }; + + userDictionaries = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + example = lib.literalExpression '' + [ + (pkgs.writeTextFile { + name = "userdict-en_US"; + destination = "/userdict-en_US.txt"; + text = ''' + Nixpkgs | n I k s - ' p { - k @ - dZ @ s + '''; + }) + ] + ''; + description = '' + Paths to the user dictionary files for MaryTTS. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.marytts.settings = { + "mary.base" = lib.mkDefault cfg.basePath; + "socket.port" = lib.mkDefault cfg.port; + }; + + environment.systemPackages = [ cfg.package ]; + + systemd.services.marytts = { + description = "MaryTTS server instance"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + # FIXME: MaryTTS's config loading mechanism appears to be horrendously broken + # and it doesn't seem to actually read config files outside of precompiled JAR files. + # Using system properties directly works for now, but this is really ugly. + script = '' + ${lib.getExe pkgs.marytts} -classpath "${cfg.basePath}/lib/*:${cfg.package}/lib/*" ${ + lib.concatStringsSep " " (lib.mapAttrsToList (n: v: ''-D${n}="${v}"'') cfg.settings) + } + ''; + + restartTriggers = cfg.voices ++ cfg.userDictionaries; + + serviceConfig = { + DynamicUser = true; + User = "marytts"; + RuntimeDirectory = "marytts"; + StateDirectory = "marytts"; + Restart = "on-failure"; + RestartSec = 5; + TimeoutSec = 20; + + # Hardening + ProtectClock = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectHome = true; + ProcSubset = "pid"; + + PrivateTmp = true; + PrivateNetwork = false; + PrivateUsers = cfg.port >= 1024; + PrivateDevices = true; + + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + + MemoryDenyWriteExecute = false; # Java does not like w^x :( + LockPersonality = true; + AmbientCapabilities = lib.optional (cfg.port < 1024) "CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = ""; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@resources" + "~@privileged" + ]; + UMask = "0027"; + }; + }; + + systemd.tmpfiles.settings."10-marytts" = { + "${cfg.basePath}/lib"."L+".argument = "${pkgs.symlinkJoin { + name = "marytts-lib"; + + # Put user paths before default ones so that user ones have priority + paths = cfg.voices ++ [ "${cfg.package}/lib" ]; + }}"; + + "${cfg.basePath}/user-dictionaries"."L+".argument = "${pkgs.symlinkJoin { + name = "marytts-user-dictionaries"; + + # Put user paths before default ones so that user ones have priority + paths = cfg.userDictionaries ++ [ "${cfg.package}/user-dictionaries" ]; + }}"; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6ce214cc4ed6..e737abecb395 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -579,6 +579,7 @@ in { mailman = handleTest ./mailman.nix {}; man = handleTest ./man.nix {}; mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; + marytts = handleTest ./marytts.nix {}; mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; }); mate = handleTest ./mate.nix {}; diff --git a/nixos/tests/marytts.nix b/nixos/tests/marytts.nix new file mode 100644 index 000000000000..4c80cf5cc4e1 --- /dev/null +++ b/nixos/tests/marytts.nix @@ -0,0 +1,87 @@ +import ./make-test-python.nix ( + { lib, ... }: + let + port = 59126; + in + { + name = "marytts"; + meta.maintainers = with lib.maintainers; [ pluiedev ]; + + nodes.machine = + { pkgs, ... }: + { + networking.firewall.enable = false; + networking.useDHCP = false; + + services.marytts = { + enable = true; + inherit port; + + voices = [ + (pkgs.fetchzip { + url = "https://github.com/marytts/voice-bits1-hsmm/releases/download/v5.2/voice-bits1-hsmm-5.2.zip"; + hash = "sha256-1nK+qZxjumMev7z5lgKr660NCKH5FDwvZ9sw/YYYeaA="; + }) + ]; + + userDictionaries = [ + (pkgs.writeTextFile { + name = "userdict-en_US.txt"; + destination = "/userdict-en_US.txt"; + text = '' + amogus | @ - ' m @U - g @ s + Nixpkgs | n I k s - ' p { - k @ - dZ @ s + ''; + }) + ]; + }; + }; + + testScript = '' + from xml.etree import ElementTree + from urllib.parse import urlencode + + machine.wait_for_unit("marytts.service") + + with subtest("Checking health of MaryTTS server"): + machine.wait_for_open_port(${toString port}) + assert 'Mary TTS server' in machine.succeed("curl 'localhost:${toString port}/version'") + + with subtest("Generating example MaryXML"): + query = urlencode({ + 'datatype': 'RAWMARYXML', + 'locale': 'en_US', + }) + xml = machine.succeed(f"curl 'localhost:${toString port}/exampletext?{query}'") + root = ElementTree.fromstring(xml) + text = " ".join(root.itertext()).strip() + assert text == "Welcome to the world of speech synthesis!" + + with subtest("Detecting custom voice"): + assert "bits1-hsmm" in machine.succeed("curl 'localhost:${toString port}/voices'") + + with subtest("Finding user dictionary"): + query = urlencode({ + 'INPUT_TEXT': 'amogus', + 'INPUT_TYPE': 'TEXT', + 'OUTPUT_TYPE': 'PHONEMES', + 'LOCALE': 'en_US', + }) + phonemes = machine.succeed(f"curl 'localhost:${toString port}/process?{query}'") + phonemes_tree = ElementTree.fromstring(phonemes) + print([i.get('ph') for i in phonemes_tree.iter('{http://mary.dfki.de/2002/MaryXML}t')]) + assert ["@ - ' m @U - g @ s"] == [i.get('ph') for i in phonemes_tree.iter('{http://mary.dfki.de/2002/MaryXML}t')] + + with subtest("Synthesizing"): + query = urlencode({ + 'INPUT_TEXT': 'Nixpkgs is a collection of over 100,000 software packages that can be installed with the Nix package manager.', + 'INPUT_TYPE': 'TEXT', + 'OUTPUT_TYPE': 'AUDIO', + 'AUDIO': 'WAVE_FILE', + 'LOCALE': 'en_US', + }) + machine.succeed(f"curl 'localhost:${toString port}/process?{query}' -o ./audio.wav") + machine.copy_from_vm("./audio.wav") + ''; + } +) diff --git a/pkgs/by-name/ma/marytts/deps.json b/pkgs/by-name/ma/marytts/deps.json new file mode 100644 index 000000000000..3da82d1240ce --- /dev/null +++ b/pkgs/by-name/ma/marytts/deps.json @@ -0,0 +1,405 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "http://opennlp.sourceforge.net/models-1.5": { + "de-pos-maxent": { + "bin": "sha256-dwVfB2b3tv+MhCqZ6/qTQODO7AM2Beo/w86j4uyaNi4=" + }, + "en-pos-maxent": { + "bin": "sha256-ZFoJT0WoZmh6YXOFIz/SOuiw9fqLG3aZZ4GlDBe9zz0=" + } + }, + "https://plugins.gradle.org/m2": { + "de/dfki/mary#gradle-marytts-component-plugin/0.3.2": { + "jar": "sha256-lT4KL7XZHrCI8ByVRlhFIWTskjrjDEtD/xaBtqqMT8E=", + "module": "sha256-yNyDKL1v/dZ+vUslJ9I/XF94Of72LccH+N3N1C0xhDo=", + "pom": "sha256-nNon9HhH3koh6i5ZE1xX5LJHIMh9O3r3roXQAZchHxI=" + }, + "de/dfki/mary/component#de.dfki.mary.component.gradle.plugin/0.3.2": { + "pom": "sha256-Mjtu1BIXUNIUYATIlt3fdiDZXIFE1yy2X2AlZ7RdgYM=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + } + }, + "https://raw.githubusercontent.com": { + "DFKI-MLT/Maven-Repository/main/de/dfki/lt/jtok#jtok-core/1.9.3": { + "jar": "sha256-v0hxmgOKwRJMzUZzsbPLOIMXTwPFcp1X4g9S688M4Vc=", + "pom": "sha256-VWnKAEhFCLP0bMiESTLx1fHuO2VbqAPIHA9L9biC1IU=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/reload4j#reload4j/1.2.22": { + "jar": "sha256-Ii+Q0+aVQSGO9ucFR3SdaTvUwYRoF+W9eUmz4olQ+Z8=", + "pom": "sha256-8Tj74PC/646UKudkhCloKL2a77Z6qztIceyFhzdn5Pw=" + }, + "com/beust#jcommander/1.78": { + "jar": "sha256-eJHeu4S1+D6b1XWT6+zjOZq74P2TjPMGs1NMV5E7lhU=", + "pom": "sha256-b+4jHAru5t4SVra1WQzp5vbPbDl5ftZoVzUgvDQS4qc=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/google/code/findbugs#jsr305/3.0.1": { + "jar": "sha256-yIXONCSWgrwCNrSn1W78wSBI5hNaW696nN6K2M2hP80=", + "pom": "sha256-QXCnYdxb/TmBqOb3qrnirNzoLTT9Wqm7EePAkNJTFM4=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.28.0": { + "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=", + "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo=" + }, + "com/google/errorprone#error_prone_parent/2.28.0": { + "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/14.0.1": { + "pom": "sha256-5aUl7Ttdf/8qjalkHgy5hcf9uEfjCB4qNz2vLnADm2M=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.3.1-jre": { + "pom": "sha256-VUQdsn6Iad/v4FMFm99Hi9x+lVhWQr85HwAjNF/VYoc=" + }, + "com/google/guava#guava/14.0.1": { + "jar": "sha256-1p3zMxhAYF7w5f5K3WDy0o6HDjggk36in3E9IDXZq5c=", + "pom": "sha256-PdSpktU+tSShxlRqJLhTszKyZSB1XiayXTgQATFCS3s=" + }, + "com/google/guava#guava/33.3.1-jre": { + "jar": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA=", + "module": "sha256-QYWMhHU/2WprfFESL8zvOVWMkcwIJk4IUGvPIODmNzM=", + "pom": "sha256-MTtn/BPrOwY07acVoSKZcfXem4GIvCgHYoFbg6J18ZM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/ibm/icu#icu4j/54.1.1": { + "jar": "sha256-Sxp+zPD+afshyOqksYJwi1BygtVeQP+3tJIEY15FeVo=", + "pom": "sha256-3k1VZEDMK6MzHOYZ8ujr73Rq8JeLT54ZjIM2pW2fxPk=" + }, + "com/ibm/icu#icu4j/66.1": { + "jar": "sha256-Xcypk/Z/1sNXd09JjUm34Ymx2aLPzgUMtO4d2WyADxo=", + "pom": "sha256-Qv8FpFnmcPzINvtwQW0VTlvcuJo0e53stwMt7JVXt1Q=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + }, + "commons-io#commons-io/2.5": { + "jar": "sha256-oQQYNI0jSWhgDMsdmI78u9CHFuHZaTbMwYgOfSJRNHQ=", + "pom": "sha256-KOuymYvH16yyUHhSaXFkCJIADzQTWG/0LWEfEEO/7DA=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "de/dfki/mary#emotionml-checker-java/1.2.2": { + "jar": "sha256-WFdXs97l2EsSAUCq3ALN6P4GkvElMYBgXNrPEuYSXSw=", + "module": "sha256-MENdIpiQRc/EtMI/0zVuUN0zOshEtFd9E1Cs94OczM8=", + "pom": "sha256-G2G63569CsQUm0ILUsJRc1dZVIdYhf13BEoH79dkfrs=" + }, + "de/dfki/mary#marytts-common/5.2.1": { + "jar": "sha256-Adcks8gqN5QI5LwpXEVjTG/K54vZfFpWxkgiOG3/wZg=", + "pom": "sha256-kfPti+loZkjkbWXq+Y6W1nG/fssGeFZ73tNWvKIpQjQ=" + }, + "de/dfki/mary#marytts-lexicon-de/0.1.1": { + "jar": "sha256-K7Fz1AE7zbWPurSELxehYe4jEi+p4gHrTnJFhYkVvbs=", + "module": "sha256-GjDUJxz8dC+R/xdgKXlrIM8yGMIIdMyEvDK3YWcdB9I=", + "pom": "sha256-3ekILmQnkBzw68WOGyMN3gzcolPANO+RG7hP/b48pCA=" + }, + "de/dfki/mary#marytts-lexicon-en_US-cmudict/0.1.1": { + "jar": "sha256-mZUP9RiU7j29F5Yk46udNAcW6Q7ZAf2vjwi9ENBsWPg=", + "module": "sha256-QW1R9cJj8lpS5eJ62b0OCUOZWERjv8knMlxpFQsYJeY=", + "pom": "sha256-+as1Tjjn7BC385oQnbBuuB8XV6I7Ktr7kpr7weYRymI=" + }, + "de/dfki/mary#marytts-lexicon-fr/0.1.1": { + "jar": "sha256-59QlWCDkdvb0/go8keCs97e8uZTV7Tp6gKLREPjD2KY=", + "module": "sha256-hHSShbfXYcpjUCODKrwuOyMD2yG+wLeeIhAbiGyec1I=", + "pom": "sha256-Z2hBfo32vl4yiGCXpVRZRClt32fInzT8J1DJCxq5E/E=" + }, + "de/dfki/mary#marytts-lexicon-it/0.1.1": { + "jar": "sha256-Hlw0JbpX6V6LGNgXm+rzoUHFAZjUSM6djgn4ULeCvEo=", + "module": "sha256-HjeupQ5BJT/7D2rzcvW4XlVED206hXK+fDi7Ckzn9Ag=", + "pom": "sha256-jTGPtjPG4W6r4dvT6H0bSng+/AkPyk1crQvlPJR12Tw=" + }, + "de/dfki/mary#marytts-lexicon-lb/0.1.1": { + "jar": "sha256-UhECnjxaA5YH2SsGHldj86fjM8/sEXDxRAz+eKjw57E=", + "module": "sha256-Q5DsvV7ftRYq+7Ldnl+h0q3GfCcRbzu8rzivgXr8YHQ=", + "pom": "sha256-pzb4eeRDejpQYAU9Z80Z48/lB44TFZTO0954Ga76q0k=" + }, + "de/dfki/mary#marytts-lexicon-ru/0.1.1": { + "jar": "sha256-I+b2nGDudo2nLSiDslGozbukmOW+ZE53isxl1pQ8Fjs=", + "module": "sha256-6aSmHUCftntEaUX4Le2+o9RrmnHndeVW+k4xjZzi0RE=", + "pom": "sha256-8wJB3AStz0Uh0nff4PqxUGCvU+mnBByAT6bLFbi86ZU=" + }, + "de/dfki/mary#marytts-lexicon-tr/0.1.1": { + "jar": "sha256-96FshBqq8Uj3PeeJwara7Zk0eBGvS7Ykg5nURtcpY/g=", + "module": "sha256-y/edxl9qWkqcwDNWU1xbHfENiSB0AIJY0oLcBbcmmE0=", + "pom": "sha256-/qnTjfEyNsQnfr4UXY1TcFLV8bd5wj2SUuRF3rnLehI=" + }, + "de/dfki/mary#marytts-runtime/5.2.1": { + "jar": "sha256-Cp2j4x+6ZsfQne+Uxfvqs/7s4NxWz1Pp6QtGZp0r6WI=", + "pom": "sha256-pi0Qi0AY/83R3rvnlNSDcbJ4Fj+PtDXTEQyxGmMkqQ0=" + }, + "de/dfki/mary#marytts-signalproc/5.2.1": { + "jar": "sha256-HuiAF7vsFPkR4FkMRjidlY8OOn8LSXQmqPNGK+fTNsg=", + "pom": "sha256-q5x0k4qUwJbVREDBuUXPFlOctzKQiF8wKlFisdvp6S4=" + }, + "de/dfki/mary#marytts/5.2.1": { + "pom": "sha256-kyMuX+lFc1qyXn3KP+qpT8jNb8If6yPtUaYwaI3hQM4=" + }, + "gov/nist/math#jama/1.0.3": { + "jar": "sha256-xzJe4pvhqsEofdrGkPc2cfHNkRyp7KfGGZkOhjEFVv0=", + "pom": "sha256-vNwqtC4wAIf64KYiohROkMrXap65L3XQWEOh5rg1psM=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/sf/jwordnet#jwnl/1.3.3": { + "jar": "sha256-PQ2EI4cXcn7WaqM5kHwkVuCNXdAeGqJD9dkoEVgcWDA=", + "pom": "sha256-hUDWasSlaXGQJS/jqo5LluYeXZ1MAtyKfzCTQs12xq0=" + }, + "net/sf/trove4j#trove4j/2.0.2": { + "jar": "sha256-i1U60gEktGRMnwAb8t5CFMDevBurGKRMDDOjHbKDwRg=", + "pom": "sha256-PU5DrfR/+889XNOqlSN5KXe/XLo7okuMaOpxEY/ATfc=" + }, + "org/apache#apache/10": { + "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/24": { + "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.1": { + "pom": "sha256-T3l//Zw9FW3g2+wf0eY+n9hYSpPHBDV2VT38twb2TeQ=" + }, + "org/apache/httpcomponents#httpcore-nio/4.1": { + "jar": "sha256-drO+LO75XJlHzYo2WBitHIn9hZE1tQuyP90gWqGkf/c=", + "pom": "sha256-Qg90O2snSFP3IiJDtEoUxdEscKZIMPQPdDET6DCKM1Y=" + }, + "org/apache/httpcomponents#httpcore/4.1": { + "jar": "sha256-POON5R9OJGaMbRhAV6jQhUH56BXS0xnQ9GLwgwkrKc8=", + "pom": "sha256-T8hq+jjpyfqwmcz0XCvHQ9RT5qsiJJCr/oZxl1w8cyc=" + }, + "org/apache/httpcomponents#project/4.1.1": { + "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging#logging-parent/5": { + "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI=" + }, + "org/apache/logging/log4j#log4j-1.2-api/2.17.2": { + "jar": "sha256-3YxkmkbF2ArRE5TWjBM7qOmpGs+Zt7mSDdW2rT9a36g=", + "pom": "sha256-Znkw96Fy3+a+LaQpsCTdBaLFL+qKut/fD+1+Wi8KPyI=" + }, + "org/apache/logging/log4j#log4j-api/2.17.2": { + "jar": "sha256-CTUbWgOCjzac3P929O055qb8IPJPBGk10LKO9RUvjOQ=", + "pom": "sha256-K48/bUcd8Xlpkhp/D/2oPgYoqz3vx+W8oq7+0WZ2Ke8=" + }, + "org/apache/logging/log4j#log4j-api/2.24.1": { + "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", + "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.1": { + "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" + }, + "org/apache/logging/log4j#log4j-core/2.17.2": { + "jar": "sha256-Wts0/0GXzRao0k9jA1hWqTPLWVYqaIjd6G6UUPz+9kY=", + "pom": "sha256-o4kYQfrJvjSxshOrlb4wtTZGUW3LS8+pzGi+xXVH2lM=" + }, + "org/apache/logging/log4j#log4j-core/2.24.1": { + "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", + "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" + }, + "org/apache/logging/log4j#log4j/2.17.2": { + "pom": "sha256-9Kfh04fB+5s2XUyzbScO+GNLpJrSBVWMThzafUG1I/U=" + }, + "org/apache/logging/log4j#log4j/2.24.1": { + "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" + }, + "org/apache/opennlp#opennlp-maxent/3.0.3": { + "jar": "sha256-bpn6V7HzZFtJkqs8+qiySrygkhzy9XXWP8pDzYTdROY=", + "pom": "sha256-x/ai6svRgUwwxAsUTuB42E8IoKxaCRG6EacahNZrkhU=" + }, + "org/apache/opennlp#opennlp-tools/1.5.3": { + "jar": "sha256-Wn6uC1Rf9RfIAQRAzMQUTPz4O6rCtnohoa9mjmAi1dI=", + "pom": "sha256-PKfSTYo15l4csWmvhi1ft1YGJYNeDCjZCYGyJfVg7xY=" + }, + "org/apache/opennlp#opennlp-tools/1.9.2": { + "jar": "sha256-bsu7DbR7KJI2DVt392xIhC3pf0R7ohvPbc4/kSdzJFw=", + "pom": "sha256-n3Ailz1L2qp/9vwNEye8BVk+JUSawVBoCZTwGIdR3Ng=" + }, + "org/apache/opennlp#opennlp/1.5.3": { + "pom": "sha256-IRL2TWZGadjl1J1qcV1xBhENJSHo1QJGdcsGSjRIqUY=" + }, + "org/apache/opennlp#opennlp/1.9.2": { + "pom": "sha256-RZkOfPHGsy0foxwbySAgb0d1cZlx5YnsYgH4nViNNaM=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/easytesting#fest-assert/1.4": { + "jar": "sha256-ivmcsM16NXtWRAHWpc3yurvkA46wCC5amqSxmiY0JE8=", + "pom": "sha256-61ZTfeZ7zg7xCdEXPRx28kfs1HgYOCDm3oLSP2hlyG8=" + }, + "org/easytesting#fest-util/1.1.6": { + "jar": "sha256-34ggqSJfFYDs6do7QFtwgLS9yI1qQtJWknayyPHs3Yk=", + "pom": "sha256-A/rLiiyZC+IXonfAVvF+pUDFCSETzpbyB/MmqjdsVhw=" + }, + "org/easytesting#fest/1.0.8": { + "pom": "sha256-xXTKpeT5wZ9C+mW+E2N2gniRk6ZV88yChWTHgIJuMYw=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hsqldb#hsqldb/2.0.0": { + "jar": "sha256-xzyMokOE6zykNRyPJTykObZkxJeu2KrHHLFMAzyOu3A=", + "pom": "sha256-eQ+COojM5vSYqjEnNw4oO9DGg/Z5626FYfAc+XtCtDI=" + }, + "org/hsqldb#hsqldb/2.7.3": { + "pom": "sha256-MIkqaFieqpQEK9nLKuD5Ud8CotwA5MRV7gLkleODJtw=" + }, + "org/hsqldb#hsqldb/2.7.3/jdk8": { + "jar": "sha256-EGfPoHbO0yXlSaFUfklmBxtIuzJDBVmJTH8eMpxdMVY=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/slf4j#slf4j-api/1.6.1": { + "jar": "sha256-2EnRF/w3mIOMbNQttqfs9tmuBQw5l0F7jk4lHlkrHT4=", + "pom": "sha256-Bpujg3vfi9tIB2SPFXn9Q7wpK412pvMbFXSGfdk7ylY=" + }, + "org/slf4j#slf4j-api/1.7.32": { + "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", + "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-log4j12/2.0.16": { + "pom": "sha256-T3GExYF1HdXIKSP0XeIPIdpkeUPOqDdjAAKpZMZav1I=" + }, + "org/slf4j#slf4j-parent/1.6.1": { + "pom": "sha256-NNbnTB8WWHcbCuapekVKOtII5O26Oi1LoAVQ5vRf9wI=" + }, + "org/slf4j#slf4j-parent/1.7.32": { + "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-reload4j/2.0.16": { + "jar": "sha256-gDuJTuOmDlFsTeP3R8EwY5oFolvK8KoAuqscReDovVc=", + "pom": "sha256-FHbSw5i9vMg8K76uIDrS4Ru2lJPtdhwZ5vQkMrhQdjo=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/swinglabs#swing-layout/1.0.3": { + "jar": "sha256-e1Jqxfq+wenR7Gx2TmgYi99Me9lsI9kdNFBZL8SmuoU=", + "pom": "sha256-Y0y+gvGbkZWAFokJazI/xPkFM42HpcSmUgyjrTIpU34=" + }, + "org/testng#testng/7.5": { + "jar": "sha256-5UnbUNzEIflQHWr5M68V5PupZhdXdAnZOXJM1+GiUDM=", + "module": "sha256-WCXsJh+Oc1LSYEA6E+viOvaKcooOwnIApFDplBGX518=", + "pom": "sha256-p4skar8S970/pQc2obLXaGM3Ii5L/kEkzTWzWEsaWCE=" + }, + "org/testng#testng/7.5.1": { + "jar": "sha256-payS0jYsyzpQmr5o44XKgJp8lvy6+FGz7oussqyJni8=", + "module": "sha256-pOgk7jAp1HT1lymEgXw7DMaVA/MlcAwX6zHTm3+eCUk=", + "pom": "sha256-OTFZjEFunSVl2nHrFM1YNK/nVD8j+AnUXSpiTDJhthU=" + }, + "org/webjars#jquery/3.5.1": { + "jar": "sha256-gxaBEiIKyRKj26DuuukKTaW/HiSxuv1AHj1Pn1mLsss=", + "pom": "sha256-T7rggddIUv8pQ80GlpanmWKK5t8igotT+kVjNBBMmHg=" + }, + "xmlunit#xmlunit/1.6": { + "jar": "sha256-9xXOgmt9OfDj1azNfFDJHdZozh8BZIfBoW7nbPPgCnQ=", + "pom": "sha256-R7eJM5BrW1LkAVL9UYgGsUXt5jyJcDfre6GOb+N4eC4=" + } + } +} diff --git a/pkgs/by-name/ma/marytts/package.nix b/pkgs/by-name/ma/marytts/package.nix new file mode 100644 index 000000000000..b74c55f4d458 --- /dev/null +++ b/pkgs/by-name/ma/marytts/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + # Gradle 8 complains about implicit task dependencies when using `installDist`. + # See https://github.com/marytts/marytts/issues/1112 + gradle_7, + makeWrapper, + jdk, + nixosTests, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marytts"; + version = "5.2.1-unstable-2024-10-09"; + + src = fetchFromGitHub { + owner = "marytts"; + repo = "marytts"; + rev = "1c2aaa0751b7cef8ae83216dd78b4c61232b3840"; + hash = "sha256-jGpsD6IwJ67nDLnulBn8DycXCyowssSnDCkQXBIfOH8="; + }; + + nativeBuildInputs = [ + gradle_7 + makeWrapper + ]; + + mitmCache = gradle_7.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # Required for the MITM cache to function + __darwinAllowLocalNetworking = true; + + gradleBuildTask = "installDist"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv build/install/source/{lib,user-dictionaries} $out + + makeWrapper ${lib.getExe jdk} $out/bin/marytts-server \ + --add-flags "-cp \"$out/lib/*\"" \ + --append-flags "marytts.server.Mary" + + # We skip the GUI installer since frankly it is a PITA to get to work with a hardened systemd service, + # and the imperative installation paradigm is not ideal either way while using Nix. + + runHook postInstall + ''; + + passthru.tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux { + nixos = nixosTests.marytts; + }; + + meta = { + description = "Open-source, multilingual text-to-speech synthesis system written in pure Java"; + homepage = "https://marytts.github.io/"; + license = lib.licenses.lgpl3Only; + inherit (jdk.meta) platforms; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "marytts-server"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # Gradle dependencies + ]; + }; +}) From c630658157bbbef4619c2119859b9ca27cfd3c1e Mon Sep 17 00:00:00 2001 From: Devin <90054389+justDeeevin@users.noreply.github.com> Date: Thu, 12 Dec 2024 00:36:25 -0500 Subject: [PATCH 75/79] syspower: init at 0-unstable-2024-12-12 (#363716) * maintainers: add justdeeevin * syspower: init at 0-unstable-2024-12-10 * syspower: 0-unstable-2024-12-10 -> 0-unstable-2024-12-12 This fixes a crucial bug relating to usage with nixos --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/sy/syspower/package.nix | 45 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/by-name/sy/syspower/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80478f7b5985..77a264e4761a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11289,6 +11289,12 @@ githubId = 31776703; name = "Ariel Ebersberger"; }; + justdeeevin = { + email = "devin.droddy@gmail.com"; + github = "justdeeevin"; + githubId = 90054389; + name = "Devin Droddy"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; diff --git a/pkgs/by-name/sy/syspower/package.nix b/pkgs/by-name/sy/syspower/package.nix new file mode 100644 index 000000000000..d7a01b8b387b --- /dev/null +++ b/pkgs/by-name/sy/syspower/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + makeWrapper, + pkg-config, + gtkmm4, + gtk4-layer-shell, +}: +stdenv.mkDerivation { + pname = "syspower"; + version = "0-unstable-2024-12-10"; + + src = fetchFromGitHub { + owner = "System64fumo"; + repo = "syspower"; + rev = "323332b4d97a30360455682194ed35868fcbaf71"; + hash = "sha256-obL9XUf8kONBWZoyrPvN1PWmEyQx8vMsl6KIneSjkGM="; + }; + + buildInputs = [ + gtkmm4 + gtk4-layer-shell + ]; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postFixup = '' + wrapProgram $out/bin/syspower --prefix LD_LIBRARY_PATH : $out/lib + ''; + + meta = { + description = "Simple power menu/shutdown screen for Hyprland"; + homepage = "https://gihub.com/System64fumo/syspower"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ justdeeevin ]; + mainProgram = "syspower"; + platforms = lib.platforms.linux; + }; +} From 68c57139a73cd2b76b15c5ebf43a3c73a815ec8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Dec 2024 06:38:49 +0100 Subject: [PATCH 76/79] python312Packages.heatzypy: 2.5.5 -> 2.5.6 (#364472) Diff: https://github.com/Cyr-ius/heatzypy/compare/refs/tags/2.5.5...2.5.6 Changelog: https://github.com/cyr-ius/heatzypy/releases/tag/2.5.6 --- pkgs/development/python-modules/heatzypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 4227da42494d..a8fdd8a0de70 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.5.5"; + version = "2.5.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-S1wIVeUTbtF5omImt38YNvZEutyCEYMGExccs0FIK44="; + hash = "sha256-+iT3lE54xt7usz9v9JZqwQa0Xf1eLlN5VuQrjzmWo6Y="; }; build-system = [ From 09ae4df6e7e39d95d55a2094c5bb641db0db2e9d Mon Sep 17 00:00:00 2001 From: Alesya Huzik Date: Thu, 12 Dec 2024 16:43:19 +1100 Subject: [PATCH 77/79] vtm: remove myself from maintainers (#364434) I don't use vtm, and while I packaged it because I was curious about it, someone automated it's updates and I keep getting pinged for PRs that I don't care for. --- pkgs/by-name/vt/vtm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vt/vtm/package.nix b/pkgs/by-name/vt/vtm/package.nix index 9e321cf70845..bf7d4b340890 100644 --- a/pkgs/by-name/vt/vtm/package.nix +++ b/pkgs/by-name/vt/vtm/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://vtm.netxs.online/"; license = lib.licenses.mit; mainProgram = "vtm"; - maintainers = with lib.maintainers; [ ahuzik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) From b4cf66f2260abd5d3891fb3edc50ffd63ef587bc Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 12 Dec 2024 06:45:44 +0100 Subject: [PATCH 78/79] nixos/portunus: fix defaultText (#364382) --- nixos/modules/services/misc/portunus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index 6f2ca0a83c8d..0ab9d69df96a 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -120,7 +120,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.openldap; - defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }"; + defaultText = lib.literalExpression "pkgs.openldap"; description = "The OpenLDAP package to use."; }; From 31356d77aa87f6b2383f69447e16e4855acb2a40 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Dec 2024 09:00:44 +0100 Subject: [PATCH 79/79] =?UTF-8?q?ocamlPackages.elpi:=201.20.0=20=E2=86=92?= =?UTF-8?q?=202.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/elpi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 29ee03b9df04..8c60431432c8 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -8,7 +8,8 @@ , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" +, version ? if lib.versionAtLeast ocaml.version "4.13" then "2.0.5" + else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" else "1.15.2" }: @@ -16,6 +17,7 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc="; release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA="; release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k=";