Merge master into staging-next

2020-08-01 19:37:20 +02:00
parent 941aec472e 3541e8b4fb
commit 50c060d13d
347 changed files with 5411 additions and 2741 deletions
@@ -27,4 +27,4 @@ buildGoModule rec {
    license = licenses.asl20;
    maintainers = with maintainers; [ aaronjanse ];
  };
-}
+}
@@ -20,4 +20,4 @@ buildGoModule rec {
    license = licenses.mit;
    homepage = "https://go.tacodewolff.nl/minify";
  };
-}
+}
@@ -22,4 +22,4 @@ buildGoPackage rec {
    maintainers = with maintainers; [ maintainers."1000101" ];
    platforms = platforms.all;
  };
-}
+}