From 3a93fcfd1ef1ac2bcba27cf630fe8e77a89eb17e Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sat, 10 Aug 2019 14:24:11 +0200 Subject: make-options-doc: expose Nix set --- nixos/lib/make-options-doc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'nixos/lib') diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index c22c7500335d..c8f40f7492e2 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -88,8 +88,11 @@ let # Convert the list of options into an XML file. optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); + optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); + in rec { - # The NixOS options in JSON format. + inherit optionsNix; + optionsJSON = pkgs.runCommand "options.json" { meta.description = "List of NixOS options in JSON format"; } @@ -98,9 +101,7 @@ in rec { dst=$out/share/doc/nixos mkdir -p $dst - cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) - } $dst/options.json + cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json mkdir -p $out/nix-support echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products -- cgit 1.4.1