Merge staging-next into staging

2019-07-03 08:59:42 +02:00
parent d41bc0ff56 3ad01beda7
commit 25a77b7210
411 changed files with 4314 additions and 2253 deletions
@@ -42,10 +42,10 @@ in
    configText = mkOption {
      default = "";
      example = ''
-        cache-size=1000
-        scan-path=/srv/git
        source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
        about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh
+        cache-size=1000
+        scan-path=/srv/git
      '';
      type = types.lines;
      description = ''