From d1d43e601cbe60b369faec0a7b1941a0594f5013 Mon Sep 17 00:00:00 2001 From: Lunaphied Date: Wed, 3 Apr 2024 15:55:27 -0600 Subject: [PATCH] overlay: support nix-doc integration into Lix --- flake.lock | 8 ++++---- overlay.nix | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 041911b..63666f0 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1711639271, - "narHash": "sha256-SIdsZPOTKIkcTCm5e5bdIffC9UJygwQBEa4C55XUxJM=", + "lastModified": 1712180067, + "narHash": "sha256-XU32CuKt0wXB8Ws5P3pZFMlYIMVx9om1GycYpITAwZ0=", "ref": "refs/heads/main", - "rev": "47b0967cd1a28b780558e9db403c8e28bae11a13", - "revCount": 15250, + "rev": "89c31953c58d8089c85ae7ab43a5c59bb0f9f69b", + "revCount": 15311, "type": "git", "url": "ssh://git@git.lix.systems/lix-project/lix.git" }, diff --git a/overlay.nix b/overlay.nix index 5097814..6673552 100644 --- a/overlay.nix +++ b/overlay.nix @@ -14,6 +14,9 @@ let ]; }) ); + + # Internal nix-doc used by Lix. + lix-doc = final.callPackage (lix + "/nix-doc/package.nix") { }; in { nixVersions = prev.nixVersions // rec { @@ -30,6 +33,7 @@ in patches = [ ]; buildInputs = old.buildInputs or [ ] ++ [ final.toml11 + lix-doc ]; nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.buildPackages.cmake