0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00

Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-06-10 10:35:50 +02:00
commit e58f0f6c99
55 changed files with 59249 additions and 2761 deletions

View file

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