From 8121e81d091446428e0eeefae7460a3ee74e667c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Feb 2023 19:09:57 +0100 Subject: manual: use historical nixpkgs revision to obtain needed xls files https://github.com/NixOS/nixpkgs/pull/212289 removes the xls files we relied on in favor of a new solution that goes from options.json to docbook using a python script. This commit is a band-aid approach of pulling in the necessary files from an old nixpkgs revision to fix the build of the manual until we can solve it properly. Since the intention of upstream is to get rid of docbook for good, it probably makes sense to port our module documentation to markdown already when porting our manual build process to the new toolchain. --- release.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/release.nix b/release.nix index bd409194..5eb81669 100644 --- a/release.nix +++ b/release.nix @@ -214,7 +214,19 @@ in with pkgsUpstream.lib; with builtins; { admon.style = ""; }; - xsltPath = "${nixpkgs}/nixos/lib/make-options-doc"; + xsltPath = pkgsUpstream.fetchFromGitHub { + name = "make-options-doc-xslt"; + owner = "NixOS"; + repo = "nixpkgs"; + # Latest commit before https://github.com/NixOS/nixpkgs/pull/212289 + # (df09c21fb262ed07f01099625ef9310a8a8392ae~1) + rev = "45a5c01a26e8fc5752a2bc969977ffc5e9cadac6"; + sha256 = "1vq432z3nw16a7g25s3fin491cybc8clibhpmc65q5hwb86zpaxb"; + postFetch = '' + mv "$out" "nixpkgs" + mv nixpkgs/nixos/lib/make-options-doc "$out" + ''; + }; in pkgsUpstream.stdenv.mkDerivation { name = "vuizvui-options"; -- cgit 1.4.1