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

Merge pull request #267673 from mweinelt/esphome-2023.11.0 

esphome: 2023.10.6 -> 2023.11.0
parents 2a397ad1 2b63a545

pkgs/development/python-modules/aioesphomeapi/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


buildPythonPackage rec {

  pname = "aioesphomeapi";

  version = "18.4.0";

  version = "18.4.1";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec { 
    owner = "esphome";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-jSPoVMtGRtqpDFagjvLTxps5plcN92Mp9vjtQlmqyGg=";

    hash = "sha256-o1Yv4/wSM2k+L2/JP3teUj129QlyLjoShCRWJ3lIN98=";

  };



  nativeBuildInputs = [

pkgs/development/python-modules/argcomplete/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 


buildPythonPackage rec {

  pname = "argcomplete";

  version = "3.1.2";

  format = "pyproject";

  version = "3.1.6";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec { 
    owner = "kislyuk";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-vKXHmCcZZTjVBwQZWtyRjJT4tTuIiK5Qos9yJT/mpag=";

    hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc=";

  };



  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -35,9 +35,10 @@ buildPythonPackage rec { 
  ];



  meta = with lib; {

    changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst";

    description = "Bash tab completion for argparse";

    downloadPage = "https://github.com/kislyuk/argcomplete";

    homepage = "https://kislyuk.github.io/argcomplete/";

    changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst";

    license = licenses.asl20;

    maintainers = with maintainers; [ womfoo ];

  };

pkgs/tools/misc/esphome/dashboard.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 


buildPythonPackage rec {

  pname = "esphome-dashboard";

  version = "20230904.0";

  version = "20231107.0";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-b+NlWekNXbGvhLQlQqFtSSsO99J+ldS6NddlK3lykeA=";

    hash = "sha256-84iM987nxNidMObnbY3lt78xRbN9USNtqQzfOzkd17k=";

  };



  # no tests

pkgs/tools/misc/esphome/default.nix

+6 −5
Original line number Diff line number Diff line 
{ lib

, callPackage

, python3

, python3Packages

, fetchFromGitHub

, platformio

, esptool_3
@@ -8,7 +8,7 @@ 
}:



let

  python = python3.override {

  python = python3Packages.python.override {

    packageOverrides = self: super: {

      esphome-dashboard = self.callPackage ./dashboard.nix {};

    };
@@ -16,14 +16,14 @@ let 
in

python.pkgs.buildPythonApplication rec {

  pname = "esphome";

  version = "2023.10.6";

  version = "2023.11.0";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "refs/tags/${version}";

    hash = "sha256-GqZSQVQnxLj0JrUrCMB5+RmxcJRU6ErIDGP8WaMolXk=";

    hash = "sha256-965gjYQmdsx4G4HJdBYx8u1jvAk48fLRP8QXDv1eQLM=";

  };



  postPatch = ''
@@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec { 
  # - validate_pillow_installed

  propagatedBuildInputs = with python.pkgs; [

    aioesphomeapi

    argcomplete

    click

    colorama

    cryptography
@@ -72,7 +73,7 @@ python.pkgs.buildPythonApplication rec { 
    "--set ESPHOME_USE_SUBPROCESS ''"

  ];



  nativeCheckInputs = with python.pkgs; [

  nativeCheckInputs = with python3Packages; [

    hypothesis

    mock

    pytest-asyncio