diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-09 00:02:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 00:02:27 +0000 |
commit | 592e5dab715e6e4be96e13cde15073e94d00de6c (patch) | |
tree | 3fb4ac99e50c2e188ec6b8aceb1d732e0c6418e3 /pkgs/servers | |
parent | 13d222c591f2c2a74bcf19f046f76fa3531bf98a (diff) | |
parent | 4441de75cb87dd21c4249989496ca193bc51f44b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
5 files changed, 43 insertions, 13 deletions
diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 8babfe505deda..a59003ac73960 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,25 +1,17 @@ -{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-qINtAOPrmLUWfEjZNj11W2WoIFw7Ye3KDk+9ZKtZAvo="; + hash = "sha256-7z3iAA+Q3k5jEO9ZhA06h7/17gE0FWPqDOGK/XENRWg="; }; - cargoPatches = [ - # Update version in Cargo.lock - (fetchpatch { - url = "https://github.com/mbrubeck/agate/commit/ac57093d2f73a20d0d4f84b551beef4ac9cb4a24.patch"; - hash = "sha256-OknfBkaBWm3svSp8LSvyfy2g0y0SkR7VtJQUdAjClFs="; - }) - ]; - - cargoHash = "sha256-18V1/d2A3DJmpYX/5Z8M3uAaHrULGIgCT4ntcV4N8l0="; + cargoHash = "sha256-iTopJnuH2extGnaJXL+RPUwcvj2e+k5A4BT33v+sFiA="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -31,6 +23,8 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; + __darwinAllowLocalNetworking = true; + passthru.tests = { inherit (nixosTests) agate; }; meta = with lib; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 743a70f2f1ee8..cc2c6d5cf7d30 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5633,7 +5633,8 @@ fnv-hash-fast psutil-home-assistant sqlalchemy - ]; # missing inputs: youtubeaio + youtubeaio + ]; "zabbix" = ps: with ps; [ py-zabbix ]; @@ -6505,6 +6506,7 @@ "yeelight" "yolink" "youless" + "youtube" "zamg" "zeroconf" "zerproc" diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index a2c54352d2d82..7a2cd3776a9a8 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,6 +10,8 @@ gpio = callPackage ./gpio {}; + localtuya = callPackage ./localtuya {}; + miele = callPackage ./miele {}; prometheus_sensor = callPackage ./prometheus_sensor {}; diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/default.nix b/pkgs/servers/home-assistant/custom-components/localtuya/default.nix new file mode 100644 index 0000000000000..3e3c17a33cdfa --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/localtuya/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent rec { + owner = "rospogrigio"; + domain = "localtuya"; + version = "5.2.1"; + + src = fetchFromGitHub { + owner = "rospogrigio"; + repo = "localtuya"; + rev = "v${version}"; + hash = "sha256-hA/1FxH0wfM0jz9VqGCT95rXlrWjxV5oIkSiBf0G0ac="; + }; + + meta = with lib; { + changelog = "https://github.com/rospogrigio/localtuya/releases/tag/${version}"; + description = "A Home Assistant custom Integration for local handling of Tuya-based devices"; + homepage = "https://github.com/rospogrigio/localtuya"; + maintainers = with maintainers; [ rhoriguchi ]; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index df3ed66a40cfb..8321f8598f820 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -452,6 +452,13 @@ let ]; }); + youtubeaio = super.youtubeaio.overridePythonAttrs (old: { + pytestFlagsArray = [ + # fails with pydantic v1 + "--deselect=tests/test_video.py::test_fetch_video" + ]; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; |