3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
aszlig 2d5a31a3ef
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.
2021-02-13 05:24:11 +01:00
..
doc treewide: update 21.03 to 21.05 2021-02-12 14:12:48 -08:00
lib Merge pull request #67493 from clefru/make-disk-image 2021-01-29 07:18:50 +00:00
maintainers amazonImage: Upload disks as GP3 for cheaper & faster IO (#109027) 2021-01-11 13:54:40 -05:00
modules Merge pull request #112819 (mkIf in systemd units) 2021-02-13 05:24:11 +01:00
tests tests/vscodium: Fix race condition 2021-02-10 16:38:13 +01:00
COPYING
default.nix nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems 2021-01-08 19:36:10 +01:00
README
release-combined.nix Revert "release-combined.tested: Temporarily remove the Chromium test" 2021-01-24 15:27:49 +01:00
release-small.nix
release.nix lib: Clean up how linux and gcc config is specified 2021-01-23 10:01:28 -05:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
https://nixos.org/nixos and in the manual in doc/manual.