From 74b44bcbf27bdaa13142c51c155df7671a68ffe7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 9 Mar 2026 12:31:48 +0100 Subject: [PATCH] nixos/documentation: use structuredAttrs instead of passAsFile --- nixos/modules/misc/documentation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 516bf903187b..d91685de662a 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -133,19 +133,21 @@ let libPath = filter (pkgs.path + "/lib"); pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib"); nixosPath = filteredModules + "/nixos"; - NIX_ABORT_ON_WARN = warningsAreErrors; + env.NIX_ABORT_ON_WARN = warningsAreErrors; modules = "[ " + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy + " ]"; - passAsFile = [ "modules" ]; disallowedReferences = [ filteredModules libPath pkgsLibPath ]; + __structuredAttrs = true; } '' + modulesPath="$TMPDIR/modules" + printf "%s" "$modules" > "$modulesPath" export NIX_STORE_DIR=$TMPDIR/store export NIX_STATE_DIR=$TMPDIR/state ${pkgs.buildPackages.nix}/bin/nix-instantiate \