movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

nixos/make-options-doc: Support Nix-provided declaration locations

Browse source 
Feature was introduced in https://github.com/NixOS/nixpkgs/pull/174460,
but wasn't supported in `mergeJSON.py` yet.
This commit is contained in:
Robert Hensing 2022-06-27 20:03:34 +02:00
parent 8bff3fef40
commit 7c81905344
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/lib/make-options-doc/mergeJSON.py
View file

@ -198,7 +198,7 @@ overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r')))
for (k, v) in options.items(): for (k, v) in options.items():
# The _module options are not declared in nixos/modules # The _module options are not declared in nixos/modules
if v.value['loc'][0] != "_module": 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 # merge both descriptions
for (k, v) in overrides.items(): for (k, v) in overrides.items():