Merge branch 'master' into staging-next

zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
This commit is contained in:
Jan Tojnar
2021-01-08 02:07:34 +01:00
64 changed files with 1092 additions and 930 deletions
+1 -1
View File
@@ -81,7 +81,7 @@ let
inherit description;
license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
maintainers = with maintainers; [ adev ak johanot krav ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
ceph-common = python3Packages.buildPythonPackage rec{