Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 11:03:38 -07:00
21 changed files with 264 additions and 238 deletions
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyatmo";
version = "4.2.2";
version = "4.2.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jabesq";
repo = "pyatmo";
rev = "v${version}";
sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I=";
sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k=";
};
postPatch = ''