From 5cd20ff81da5232849eb782eb47af4078f606273 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 16 Dec 2025 15:46:06 +0100 Subject: [PATCH] lixPackageSets: apply mdbook 0.5 support patches Apply patches to lix_2_93, lix_2_94, and git versions to support building documentation with mdbook 0.5. The patch is from upstream Lix commit 54df89f6, which maintains compatibility with both mdbook 0.4.x and 0.5.x. https://git.lix.systems/lix-project/lix/issues/1051 --- pkgs/tools/package-management/lix/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index ebf4a6fd6b09..b4eaa2d80269 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -30,6 +30,14 @@ confDir ? "/etc", }: let + # Support for mdbook >= 0.5, https://git.lix.systems/lix-project/lix/issues/1051 + lixMdbookPatch = fetchpatch2 { + name = "lix-mdbook-0.5-support.patch"; + url = "https://git.lix.systems/lix-project/lix/commit/54df89f601b3b4502a5c99173c9563495265d7e7.patch"; + excludes = [ "package.nix" ]; + hash = "sha256-uu/SIG8fgVVWhsGxmszTPHwe4SQtLgbxdShOMKbeg2w="; + }; + makeLixScope = { attrName, @@ -214,6 +222,8 @@ lib.makeExtensible ( url = "https://git.lix.systems/lix-project/lix/commit/b6d5670bcffebdd43352ea79b36135e35a8148d9.patch"; hash = "sha256-f4s0TR5MhNMNM5TYLOR7K2/1rtZ389KDjTCKFVK0OcE="; }) + + lixMdbookPatch ]; }; }; @@ -237,6 +247,8 @@ lib.makeExtensible ( inherit src; hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; }; + + patches = [ lixMdbookPatch ]; }; }; @@ -259,6 +271,8 @@ lib.makeExtensible ( inherit src; hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; }; + + patches = [ lixMdbookPatch ]; }; };