Merge master into staging-next

2019-06-10 10:35:50 +02:00
parent 4416712772 80b51d983a
commit e58f0f6c99
55 changed files with 59249 additions and 2761 deletions
@@ -669,7 +669,7 @@ let
    };
  };

-  commonMatchText = def: ''
+  commonMatchText = def: optionalString (def.matchConfig != {}) ''
    [Match]
    ${attrsToSection def.matchConfig}
  '';