diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-06-27 20:03:34 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-06-27 22:07:20 +0200 |
| commit | 7c81905344bd308c62509f93c87274c50ab54092 (patch) | |
| tree | cdf0f34ce869499c776edc10ec7b25590b411c2b /nixos/lib | |
| parent | 8bff3fef401ed3ead39fd42bd581590ed863026e (diff) | |
nixos/make-options-doc: Support Nix-provided declaration locations
Feature was introduced in https://github.com/NixOS/nixpkgs/pull/174460, but wasn't supported in `mergeJSON.py` yet.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-options-doc/mergeJSON.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 5f70d07ce4ad8..33e5172270b58 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -198,7 +198,7 @@ overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) for (k, v) in options.items(): # The _module options are not declared in nixos/modules if v.value['loc'][0] != "_module": - v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations'])) + v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}' if isinstance(s, str) else s, v.value['declarations'])) # merge both descriptions for (k, v) in overrides.items(): |