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: 29dcf53a5501
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2d5a31a3ef2c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 11, 2021

  1. nixos/systemd-lib: allow mkIf in unitOption

    `unitOption` is only used inside of `attrsOf` wich is perfectly capable of
    handling the attrsets from `mkIf`, though the checkUnitConfig test
    forbids it. This commit weakens that restriction to allow the usage of
    `mkIf` inside of `systemd.services.<name>.serviceConfig.<something>`
    etc.
    thelegy committed Feb 11, 2021
    Copy the full SHA
    97718a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2021

  1. Merge pull request #112819 (mkIf in systemd units)

    @thelegy writes:
    
      unitOption is only used inside of attrsOf wich is perfectly capable of
      handling the attrsets from mkIf, though the checkUnitConfig test
      forbids it.
    
      This commit weakens that restriction to allow the usage of mkIf inside
      of systemd.services.<name>.serviceConfig.<something> etc.
    
    While I personally don't like that we can't easily use
    pushDownProperties from the module system and need to rely on internals,
    we *already* use internals for the mkOverride case, so adding another
    case for mkIf doesn't add a hard-to-find indirection.
    
    I'm merging this, since this fixes a valid use case and it shouldn't
    make refactoring worse than before.
    aszlig committed Feb 13, 2021
    Copy the full SHA
    2d5a31a View commit details
    Browse the repository at this point in the history