Restic: add unitConfig option #368234
Restic: add unitConfig option #368234
Conversation
github-actions
bot
added
6.topic: nixos
github-actions
bot
added
10.rebuild-darwin: 0
jerith666
force-pushed
the
restic-unit-config
branch
from
a664c17 to
780cb39
Compare
I thought that nixpkgs was moving towards enforcing standard formatting for all nix code, so I've been doing that in all my recent PRs. However, I see that the recent #366941, which also touched these files, did not encounter any complaints (either from automated formatting checks or from human reviewers), so I must have misunderstood where we are in that process. In any event, since the code change is built on top of the reformatting, it's non-trivial to rebase it & get rid of the formatting. So hopefully you can review the substantive change by just looking at this PR's second commit in isolation? |
|
My bad I failed to realize there were two commits. You did the right thing! |
| @@ -402,6 +413,7 @@ in | |||
| EnvironmentFile = backup.environmentFile; | |||
| }; | |||
| } | |||
| // lib.optionalAttrs (backup.unitConfig != null) backup.unitConfig | |||
There was a problem hiding this comment.
This shouldn't be a // update. The issue here is that it doesn't actually merge the values given above with the ones specified in unitConfig. For example, if I give unitConfig.serviceConfig = {};, it removes all the config given in this module.
I know you can use updateRecursive or mkMerge here but I'm never sure when you can use one or the other.
| inherit passwordFile paths; | ||
| repository = remoteRepository; | ||
| unitConfig = { | ||
| documentation = [ "custom-unit-config-was-written" ]; |
There was a problem hiding this comment.
I would add serviceConfig = { something here }; to make sure to catch the issue with the // operator.
as requested in #367359; cc @MatthiasvB @bbigras @i077
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.