Merge pull request #262084 from imlonghao/borgmatic/fix-262020

borgmatic: fix deprecation warning check failed
This commit is contained in:
Weijia Wang 2023-10-28 15:33:39 +02:00 committed by GitHub
commit 66ab26fce8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -81,7 +81,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
warnings = [] warnings = []
++ optional (cfg.settings != null && cfg.settings.location != null) ++ optional (cfg.settings != null && cfg.settings ? location)
"`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope" "`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope"
++ optional (catAttrs "location" (attrValues cfg.configurations) != []) ++ optional (catAttrs "location" (attrValues cfg.configurations) != [])
"`services.borgmatic.configurations.<name>.location` is deprecated, please move your options out of sections to the global scope" "`services.borgmatic.configurations.<name>.location` is deprecated, please move your options out of sections to the global scope"