diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-06-26 13:42:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 13:42:41 +0200 |
| commit | a6fc4a2bf6bf60ed09e156de5e902145324bb64b (patch) | |
| tree | 93e80f0aa8255a635da250516ca02480baf1b2fe /pkgs/tools | |
| parent | 909f74453ef69cf26af6be9fa59e0908a98bd79b (diff) | |
| parent | 71f06deb49afb59d50e7abb7f276a0981eae7a90 (diff) | |
Merge pull request #321131 from mweinelt/esphome-2024.6.0
esphome: 2024.5.4 -> 2024.6.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/esphome/dashboard.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/misc/esphome/default.nix | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index d8428e365fcd1..0b485ad49e6af 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20240412.0"; + version = "20240620.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-MT/EpZ8kDKHhJGF4njdh6Q+xe8GF4FYxaoIighSguiQ="; + pname = "esphome_dashboard"; + inherit version; + hash = "sha256-lx3i8Z2PUefyibCNiQ4zPEwfgXr6r/TVa9TBF0YE5fA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 7dc67ba2ef70f..f5f3c68a16ad1 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.5.4"; + version = "2024.6.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UxNMHRQLrViK9ssFc0vHA/zqNw5yH8E6n+OAnq6vJdQ="; + hash = "sha256-bFQnAuyEBzFV9xiGOHLJrR4oTUU8ZRHjIa3ww0yCNRk="; }; nativeBuildInputs = with python.pkgs; [ @@ -38,9 +38,17 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + pythonRemoveDeps = [ + "esptool" + "platformio" + ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + # drop coverage testing - sed -i '/--cov/d' pytest.ini + sed -i '/--cov/d' pyproject.toml # ensure component dependencies are available cat requirements_optional.txt >> requirements.txt |