Merge master into staging-next

2018-12-03 12:18:43 +01:00
parent 077b7e5880 e869896d00
commit a510aa2672
388 changed files with 3023 additions and 1285 deletions
@@ -61,7 +61,7 @@ in buildPythonApplication rec {
       - Commandline control
       - Available in 24 languages
    '';
-    homepage = http://www.nongnu.org/sonata/;
+    homepage = https://www.nongnu.org/sonata/;
    license = stdenv.lib.licenses.gpl3;
    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.rvl ];