Merge pull request #148180 from mweinelt/esphome

authored by Martin Weinelt and committed by GitHub a77874bb 0c4a02f6

+11 -5
+2 -2
pkgs/tools/misc/esphome/dashboard.nix
··· 4 4 5 5 with python3.pkgs; buildPythonPackage rec { 6 6 pname = "esphome-dashboard"; 7 - version = "20211021.0"; 7 + version = "20211201.0"; 8 8 9 9 src = fetchPypi { 10 10 inherit pname version; 11 - sha256 = "sha256-stJ6fUs02XpCN671EztHTLkXd57eMo6472Q1e1/cbHY="; 11 + sha256 = "sha256-/VARM59TI2Ff70Jq0smFMrt4o2G/wKSdcOreLfxMAMQ="; 12 12 }; 13 13 14 14 # no tests
+9 -3
pkgs/tools/misc/esphome/default.nix
··· 2 2 , pkgs 3 3 , python3 4 4 , fetchFromGitHub 5 + , fetchpatch 5 6 , platformio 6 7 , esptool 7 8 , git ··· 16 17 in 17 18 with python.pkgs; buildPythonApplication rec { 18 19 pname = "esphome"; 19 - version = "2021.10.1"; 20 + version = "2021.11.4"; 21 + format = "setuptools"; 20 22 21 23 src = fetchFromGitHub { 22 24 owner = pname; 23 25 repo = pname; 24 26 rev = version; 25 - sha256 = "sha256-zVZantMYtDWkvFrXmX0HpUchmc3T2gbkrMiWGP2ibNc="; 27 + sha256 = "sha256-hPnng3Jkb2FucEOar/MIjvWHKbT3NNxEn6CIr3sd1Ng="; 26 28 }; 27 29 28 30 patches = [ 29 31 # fix missing write permissions on src files before modifing them 30 - ./fix-src-permissions.patch 32 + ./fix-src-permissions.patch 33 + (fetchpatch { 34 + url = "https://github.com/esphome/esphome/commit/fbe1bca1b9896ba8c8b754c5a4faf790bffd887b.patch"; 35 + sha256 = "sha256-Iyc79iL2YkLGD81TbFK3GaCY2L9nTE9mKz6MQSNQWr8="; 36 + }) 31 37 ]; 32 38 33 39 postPatch = ''