From a4a56fe47b252409336946681efac7b0c4521bbd Mon Sep 17 00:00:00 2001 From: Birdee <85372418+BirdeeHub@users.noreply.github.com> Date: Sun, 1 Feb 2026 04:03:41 -0800 Subject: [PATCH] nixosOptionsDoc: fix discarded context warning addresses https://github.com/NixOS/nixpkgs/issues/485682 --- nixos/lib/make-options-doc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 67c0fb130db1..414fddfb2625 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -214,9 +214,8 @@ rec { pkgs.brotli pkgs.python3 ]; - options = builtins.toFile "options.json" ( - builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix) - ); + passAsFile = [ "options" ]; + options = builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix); # merge with an empty set if baseOptionsJSON is null to run markdown # processing on the input options baseJSON = if baseOptionsJSON == null then builtins.toFile "base.json" "{}" else baseOptionsJSON; @@ -229,7 +228,7 @@ rec { TOUCH_IF_DB=$dst/.used-docbook \ python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - $baseJSON $options \ + $baseJSON $optionsPath \ > $dst/options.json if grep /nixpkgs/nixos/modules $dst/options.json; then