Unverified Commit a6fc4a2b authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #321131 from mweinelt/esphome-2024.6.0 

esphome: 2024.5.4 -> 2024.6.0
parents 909f7445 71f06deb

pkgs/tools/misc/esphome/dashboard.nix

+4 −3
Original line number Diff line number Diff line
@@ -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

pkgs/tools/misc/esphome/default.nix

+11 −3
Original line number Diff line number Diff line
@@ -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