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

This commit is contained in:
Martin Weinelt
2023-01-08 16:34:30 +01:00
109 changed files with 2814 additions and 2327 deletions
@@ -298,7 +298,12 @@ in {
minor = "3";
patch = "11";
};
sha256 = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; # linux64
sha256 = {
aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk=";
x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE=";
aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4=";
x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0=";
}.${stdenv.system};
pythonVersion = "3.9";
inherit passthruFun;
};