movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #158602 from hercules-ci/systemd-unit-mixed-list-error

Browse source 
nixos/systemd: Custom error when mixing list/non-list defs
This commit is contained in:
Jörg Thalheim 2022-06-19 07:05:04 +01:00 • committed by GitHub
commit f5ca531054
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/lib/systemd-unit-options.nix
View file

@ -20,10 +20,15 @@ in rec {
merge = loc: defs: merge = loc: defs:
let let
defs' = filterOverrides defs; defs' = filterOverrides defs;
defs'' = getValues defs';
in in
if isList (head defs'') if isList (head defs').value
then concatLists defs'' then concatMap (def:
if builtins.typeOf def.value == "list"
then def.value
else
throw "The definitions for systemd unit options should be either all lists, representing repeatable options, or all non-lists, but for the option ${showOption loc}, the definitions are a mix of list and non-list ${lib.options.showDefs defs'}"
) defs'
else mergeEqualOption loc defs'; else mergeEqualOption loc defs';
}; };