diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 97f30042b558..cdbab8d18f13 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 = "20250415.0"; + version = "20250514.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-HpmHII1pSsSO/hEHcy/QHv7jxslpz9a6EeHcEZQ+VIA="; + hash = "sha256-t0+YlITnxgnLrK/SN0bSmMIv3djR9DKMlnFrR9Btwx8="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-SiH6CqFOpDQMMtRcgxr0LSJKuziZoYVjgVTpKBoebbg="; + hash = "sha256-Uiz26kPxoz32t/GRppiYiVBVwWcQqUzPr0kScVUZak8="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 60de831b46f1..42ce5755059e 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -17,19 +17,30 @@ let self = python; packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix { }; + + paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = "v${version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + build-system = with self; [ setuptools ]; + doCheck = false; + }); }; }; in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.4.2"; + version = "2025.5.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-vy/wjtl/IbdSOxAUsV4bl7VNEBTetsvIDh2V1gDHSMs="; + hash = "sha256-BcPdgAvRR7zataL4KOhLAvQaQnS60z8UZ9xdIK7ydz4="; }; build-systems = with python.pkgs; [ @@ -50,10 +61,7 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" - - # ensure component dependencies are available - cat requirements_optional.txt >> requirements.txt + --replace-fail "setuptools==80.4.0" "setuptools" ''; # Remove esptool and platformio from requirements @@ -160,7 +168,6 @@ python.pkgs.buildPythonApplication rec { gpl3Only # The python codebase and all other parts of this codebase ]; maintainers = with maintainers; [ - globin hexa ]; mainProgram = "esphome";