diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:49:21 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 16:51:12 +0100 |
| commit | b9c0b3f126472b144c543d8d77a8047e8d905ada (patch) | |
| tree | 2ad99b8789bcb62b993ed18d2877905f7f02bdac /nixpkgs/pkgs/tools/misc/esphome/default.nix | |
| parent | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (diff) | |
| parent | c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad (diff) | |
| download | nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.gz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.bz2 nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.lz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.xz nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.tar.zst nixlib-b9c0b3f126472b144c543d8d77a8047e8d905ada.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/esphome/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/esphome/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 8413dde76961..8639358ebcaf 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,6 +1,6 @@ { 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.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GqZSQVQnxLj0JrUrCMB5+RmxcJRU6ErIDGP8WaMolXk="; + hash = "sha256-hdSWrKOht1McZxTJtgvy+vqN49bi/P54/D7WDxIRb4w="; }; 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 |