diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 4ca493db7b3a..d292fa9657e6 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20251013.0"; + version = "20260110.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; tag = version; - hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q="; + hash = "sha256-h8g/MRfOBkiCKNTOM4I6OimsE5ljgsIMQLl1eZLfP3U="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ="; + hash = "sha256-DkK2WG7oWHvwYflNdwOMfE0OVP2ICEGAhhTH2rix9zc="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 9e1dc9cd80b7..147f8c36b499 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.12.7"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-KC3LbY5mU4xig3kftIuemSz/RAnJ7wZ8eSccr9BKz9Q="; + hash = "sha256-TDXOftuj0ls+1TF6LXoX2Q+PzicL0nJP+1SJHi6qvMA="; }; patches = [ @@ -95,6 +95,7 @@ python.pkgs.buildPythonApplication rec { pyparsing pyserial pyyaml + resvg-py ruamel-yaml tornado tzdata diff --git a/pkgs/development/python-modules/resvg-py/default.nix b/pkgs/development/python-modules/resvg-py/default.nix new file mode 100644 index 000000000000..ce60f88d0455 --- /dev/null +++ b/pkgs/development/python-modules/resvg-py/default.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + pyperclip, + xvfb-run, + xclip, +}: + +buildPythonPackage (finalAttrs: { + pname = "resvg-py"; + version = "0.2.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "baseplate-admin"; + repo = "resvg-py"; + tag = finalAttrs.version; + hash = "sha256-lNNAIEEzwPEs/Qup6PXkMWezGHEAVs4VxuwBv5DgjWE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-OrXWiMIgqZ2opl3XfC2zVwN9w0xz2u08mRA883tN6pM="; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ + pytest + pyperclip + ] + ++ lib.optionals stdenv.isLinux [ + xclip + xvfb-run + ]; + + checkPhase = '' + runHook preCheck + ${lib.optionalString stdenv.hostPlatform.isLinux "xvfb-run"} python -m pytest ${lib.optionalString stdenv.hostPlatform.isDarwin "-k \"not test_multiple_layer_svg\""} + runHook postCheck + ''; + + pythonImportsCheck = [ + "resvg_py" + ]; + + meta = { + changelog = "https://github.com/baseplate-admin/resvg-py/releases/tag/${finalAttrs.src.tag}"; + description = "High level wrapper of resvg for python"; + homepage = "https://github.com/baseplate-admin/resvg-py"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9766076552d1..13735ac2daf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16466,6 +16466,8 @@ self: super: with self; { result = callPackage ../development/python-modules/result { }; + resvg-py = callPackage ../development/python-modules/resvg-py { }; + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; retinaface = callPackage ../development/python-modules/retinaface { };