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: 527f11bde380
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 70faa56775c8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 4, 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
    aszlig committed Jun 4, 2018
    Copy the full SHA
    0e7c945 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Merge pull request #41446 from aszlig/make-serviceconfig-overridable

    nixos/systemd: Allow to override serviceConfig
    edolstra committed Jun 5, 2018
    Copy the full SHA
    70faa56 View commit details
    Browse the repository at this point in the history