summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2021-07-21 23:55:00 +0200
committerGitHub <noreply@github.com>2021-07-21 23:55:00 +0200
commitb5fa0e066d1f4725ae307565610c2e275d601e6c (patch)
treef0f809630e43274694ffdcd62865ee18770a80fc /pkgs
parent286b39a505aa59a9fede9ba62693beda7063330f (diff)
parent561c1ee2d32ecb6cfcee92e8904218751bb223ba (diff)
downloadnixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar.gz
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar.bz2
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar.lz
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar.xz
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.tar.zst
nixpkgs-b5fa0e066d1f4725ae307565610c2e275d601e6c.zip
Merge pull request #130987 from mweinelt/esphome
esphome: 1.19.4 -> 1.20.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/esphome/dashboard.nix4
-rw-r--r--pkgs/tools/misc/esphome/default.nix10
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix
index a701fbd73b5..beaffadab97 100644
--- a/pkgs/tools/misc/esphome/dashboard.nix
+++ b/pkgs/tools/misc/esphome/dashboard.nix
@@ -4,11 +4,11 @@
 
 with python3.pkgs; buildPythonPackage rec {
   pname = "esphome-dashboard";
-  version = "20210623.0";
+  version = "20210719.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77";
+    sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc=";
   };
 
   # no tests
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 37c37de8399..69a67a6e918 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,13 +16,13 @@ let
 in
 with python.pkgs; buildPythonApplication rec {
   pname = "esphome";
-  version = "1.19.4";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2";
+    sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4=";
   };
 
   patches = [
@@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec {
 
     # drop coverage testing
     sed -i '/--cov/d' pytest.ini
-
-    # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1
-    # https://github.com/esphome/issues/issues/2021
-    substituteInPlace tests/unit_tests/strategies.py --replace \
-      "@st.defines_strategy_with_reusable_values" \
-      "@st.defines_strategy(force_reusable_values=True)"
   '';
 
   # Remove esptool and platformio from requirements