From dccc9491ea57e0379e2d6c72164b34f14bae7a1c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 9 Jun 2024 18:53:44 +0200 Subject: [PATCH] lix: support `docCargoLock` propagation to `lix-doc` This way, we can pass also a Cargo.lock from the Lix entrypoint. Signed-off-by: Raito Bezarius --- pkgs/tools/package-management/lix/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 01e2e8374f41..d36742a00752 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -11,6 +11,7 @@ inherit hash; }, docCargoHash ? null, + docCargoLock ? null, patches ? [ ], maintainers ? lib.teams.lix.members, }@args: @@ -69,6 +70,7 @@ assert (hash == null) -> (src != null); inherit src; version = "${version}${suffix}"; cargoHash = docCargoHash; + cargoLock = docCargoLock; }, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, @@ -83,6 +85,7 @@ assert (hash == null) -> (src != null); stateDir, storeDir, }: +assert lib.assertMsg (docCargoHash != null || docCargoLock != null) "Either `lix-doc`'s cargoHash using `docCargoHash` or `lix-doc`'s `cargoLock.lockFile` using `docCargoLock` must be set!"; stdenv.mkDerivation { pname = "lix";