Merge staging-next into staging

2021-03-23 00:40:28 +00:00
parent e43d6186ff 11ee0bf5d7
commit 13fa16d91b
32 changed files with 403 additions and 698 deletions
@@ -81,7 +81,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
  meta = with lib; {
    description = "Photo and video importer for cameras, phones, and memory cards";
    homepage = "https://www.damonlynch.net/rapid/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ jfrankenau ];
  };