Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-13 16:08:59 +01:00
79 changed files with 753 additions and 384 deletions
+2
View File
@@ -2652,6 +2652,8 @@ in {
gpsoauth = callPackage ../development/python-modules/gpsoauth { };
gpxpy = callPackage ../development/python-modules/gpxpy { };
grip = callPackage ../development/python-modules/grip { };
gst-python = callPackage ../development/python-modules/gst-python {