Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8b4ed614c9e7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: da9efe97d90c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 16, 2018

  1. nixos/systemd: Allow to override serviceConfig 

    This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
(cherry picked from commit 0e7c945)
Reason: Another user has hit this problem on Discourse[1] and I thought
        I had already backported it to 18.03, apparently I didn't. Given
        the time of the original commit I think this had enough testing
        already so it shouldn't break anything and rather make things
        less annoying.
[1]: https://discourse.nixos.org/t/is-there-a-universal-way-to-enable-a-service-auto-restart/592/3
    @aszlig
    aszlig committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    da9efe9 View commit details
    Browse the repository at this point in the history