From 28a8bb174002617a6263777ae956bb609addd494 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 12 Jul 2025 14:42:13 +0200
Subject: [PATCH] lixPackageSets.git: 2.94.0-pre-20250704_362bfd827f52 ->
 2.94.0-pre-20250807_8bbd5e1d0df9

---
 pkgs/tools/package-management/lix/common-lix.nix          | 7 +++++--
 .../tools/package-management/lix/common-nix-eval-jobs.nix | 2 +-
 pkgs/tools/package-management/lix/default.nix             | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 107d2660b9ed..ccd481c460e8 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -100,6 +100,7 @@ let
   isLegacyParser = lib.versionOlder version "2.91";
   hasDtraceSupport = lib.versionAtLeast version "2.93";
   parseToYAML = lib.versionAtLeast version "2.93";
+  usesCapnp = lib.versionAtLeast version "2.94";
 in
 # gcc miscompiles coroutines at least until 13.2, possibly longer
 # do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
@@ -144,9 +145,11 @@ stdenv.mkDerivation (finalAttrs: {
         p.toml
       ]
       ++ lib.optionals finalAttrs.doInstallCheck [
+        p.aiohttp
         p.pytest
         p.pytest-xdist
       ]
+      ++ lib.optionals usesCapnp [ p.pycapnp ]
     ))
     pkg-config
     flex
@@ -178,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
   ++ lib.optionals pastaFod [ passt ]
   ++ lib.optionals parseToYAML [ yq ]
+  ++ lib.optionals usesCapnp [ capnproto ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
 
   buildInputs = [
@@ -294,9 +298,8 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $devdoc/nix-support
       echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
     ''
-    + lib.optionalString (!hasExternalLixDoc) ''
+    + lib.optionalString (lib.versionOlder version "2.94" && !hasExternalLixDoc) ''
       # We do not need static archives.
-      # FIXME(Raito): why are they getting installed _at all_ ?
       rm $out/lib/liblix_doc.a
     ''
     + lib.optionalString stdenv.hostPlatform.isStatic ''
diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
index 26fdc0e2706b..48b76ca7179b 100644
--- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
+++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3;
     teams = [ lib.teams.lix ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isStatic;
+    broken = lib.versionOlder version "2.94" && stdenv.hostPlatform.isStatic;
   };
 }
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index fb7c9bb0435a..efc0ef628b0a 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -271,20 +271,20 @@ lib.makeExtensible (self: {
     attrName = "git";
 
     lix-args = rec {
-      version = "2.94.0-pre-20250704_${builtins.substring 0 12 src.rev}";
+      version = "2.94.0-pre-20250807_${builtins.substring 0 12 src.rev}";
 
       src = fetchFromGitea {
         domain = "git.lix.systems";
         owner = "lix-project";
         repo = "lix";
-        rev = "362bfd827f522b57062e4ebcb465bb51941632a4";
-        hash = "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=";
+        rev = "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb";
+        hash = "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=";
       };
 
       cargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-${version}";
         inherit src;
-        hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
+        hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
       };
     };
   };