Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
24c22509 86eedea2

+5 -5
+2 -2
pkgs/development/python-modules/apispec/default.nix
··· 13 14 buildPythonPackage rec { 15 pname = "apispec"; 16 - version = "6.0.2"; 17 format = "setuptools"; 18 19 disabled = pythonOlder "3.7"; 20 21 src = fetchPypi { 22 inherit pname version; 23 - hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; 24 }; 25 26 propagatedBuildInputs = [
··· 13 14 buildPythonPackage rec { 15 pname = "apispec"; 16 + version = "6.1.0"; 17 format = "setuptools"; 18 19 disabled = pythonOlder "3.7"; 20 21 src = fetchPypi { 22 inherit pname version; 23 + hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk="; 24 }; 25 26 propagatedBuildInputs = [
+3 -3
pkgs/servers/home-automation/evcc/default.nix
··· 16 17 buildGo120Module rec { 18 pname = "evcc"; 19 - version = "0.113.0"; 20 21 src = fetchFromGitHub { 22 owner = "evcc-io"; 23 repo = pname; 24 rev = version; 25 - hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; 26 }; 27 28 - vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; 29 30 npmDeps = fetchNpmDeps { 31 inherit src;
··· 16 17 buildGo120Module rec { 18 pname = "evcc"; 19 + version = "0.114.0"; 20 21 src = fetchFromGitHub { 22 owner = "evcc-io"; 23 repo = pname; 24 rev = version; 25 + hash = "sha256-YPqt1UfXP2LGSopQuM4PXQJG3MmXg+5VjDpBKpV5axI="; 26 }; 27 28 + vendorHash = "sha256-CNBwOVykQW7RUuf6oFTxO2DU6sd5IJVqN+6FPytQh+U="; 29 30 npmDeps = fetchNpmDeps { 31 inherit src;