diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/tools/misc/esphome | |
parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/esphome')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/esphome/dashboard.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/misc/esphome/default.nix | 14 |
2 files changed, 32 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix new file mode 100644 index 000000000000..3edf59002b3d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -0,0 +1,20 @@ +{ lib +, python3 +}: + +with python3.pkgs; buildPythonPackage rec { + pname = "esphome-dashboard"; + version = "20210615.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9"; + }; + + meta = with lib; { + description = "ESPHome dashboard"; + homepage = "https://esphome.io/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index fe02fe0d5219..1daf4f139cf6 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,4 +1,5 @@ { lib +, pkgs , python3 , fetchFromGitHub , platformio @@ -6,15 +7,18 @@ , git }: +let + esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; +in python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq"; + sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi"; }; postPatch = '' @@ -44,6 +48,7 @@ python3.pkgs.buildPythonApplication rec { click colorama cryptography + esphome-dashboard ifaddr paho-mqtt pillow @@ -66,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ hypothesis mock + pytest-asyncio pytest-mock pytest-sugar pytestCheckHook @@ -75,6 +81,10 @@ python3.pkgs.buildPythonApplication rec { $out/bin/esphome --help > /dev/null ''; + passthru = { + dashboard = esphome-dashboard; + }; + meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; |