From 33a31890647a7fa1ef8bbed1fc8381a7665357b4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 2 May 2026 02:29:16 +0200 Subject: [PATCH 1/2] nixpkgs-manual.epub: use structuredAttrs instead of passAsFile --- doc/doc-support/epub.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix index 2b8d6b5f2470..a77c9d5dd6f8 100644 --- a/doc/doc-support/epub.nix +++ b/doc/doc-support/epub.nix @@ -37,16 +37,16 @@ runCommand "manual.epub" ''; - passAsFile = [ "epub" ]; + __structuredAttrs = true; } '' mkdir scratch - xsltproc \ + printf "%s" "$epub" | xsltproc \ --param chapter.autolabel 0 \ --nonet \ --output scratch/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $epubPath + - echo "application/epub+zip" > mimetype zip -0Xq -b "$TMPDIR" "$out" mimetype From 0d72b17e507912120f436a07f4b537a8d3aedc74 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 2 May 2026 12:31:13 +0200 Subject: [PATCH 2/2] manualEpub: use structuredAttrs instead of passAsFile --- nixos/doc/manual/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 137010637f09..c8afe6167a7d 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -250,17 +250,17 @@ rec { ''; - passAsFile = [ "doc" ]; + __structuredAttrs = true; } '' # Generate the epub manual. dst=$out/${common.outputPath} - xsltproc \ + printf "%s" "$doc" | xsltproc \ --param chapter.autolabel 0 \ --nonet --xinclude --output $dst/epub/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $docPath + - echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub"