From 97b8213725b290e74e3b01ec8639109c81c660f9 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 13 Dec 2025 11:22:43 +0100
Subject: [PATCH 1/3] lixPackageSets.*.lix: remove unneeded libsodium
 dependency

In ce375feadf84cdffebeaa89ff4a8109e4a443121, by accident the conditional
libsodium was introduced in addition to the previously existing unconditional
one, instead of replacing it. Correct this mistake now.
---
 pkgs/tools/package-management/lix/common-lix.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index f792ad9b561d..5143ab284ead 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -196,7 +196,6 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     capnproto
     editline
-    libsodium
     openssl
     sqlite
     xz

From aba5e58b7dec581910410b8a3a3c3282e038aa1c Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sun, 4 Jan 2026 11:48:23 +0100
Subject: [PATCH 2/3] lixPackageSets.*.lix: unbreak cross builds by disabling
 install checks

Due to an issue [1] in the Python splices uncovered by the setuptools-rust
cross compilation fix [2], some dependencies will otherwise fail to build.
Unfortunately this actually means losing the tests when the build platform
can execute host binaries (such as in `pkgsStatic`), but there's not a lot
one can do about this without fixing the Python splicing.

[1] https://github.com/NixOS/nixpkgs/issues/476822
[2] https://github.com/NixOS/nixpkgs/pull/467817
---
 pkgs/tools/package-management/lix/common-lix.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 5143ab284ead..38c112a005e2 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -346,7 +346,8 @@ stdenv.mkDerivation (finalAttrs: {
     rapidcheck
   ];
 
-  doInstallCheck = true;
+  # Python splices are broken (https://github.com/NixOS/nixpkgs/issues/476822), causing build failure in `buildPackages.python3Packages.bcrypt`.
+  doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform;
   mesonInstallCheckFlags = [
     "--suite=installcheck"
     "--print-errorlogs"

From a4620e9203a55133ffcd71f578b875de6e9e0727 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sat, 29 Nov 2025 11:57:44 +0100
Subject: [PATCH 3/3] lixPackageSets.git: 2.95.0-pre-20251121_b707403a3080 ->
 2.95.0-pre-20260103_d387c9113c73

---
 pkgs/tools/package-management/lix/common-lix.nix | 14 +++++++++++++-
 pkgs/tools/package-management/lix/default.nix    |  8 +++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 38c112a005e2..7e0ddc4f4846 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -294,9 +294,21 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++
     lib.optionals
-      (stdenv.hostPlatform.isLinux && finalAttrs.doInstallCheck && lib.versionAtLeast version "2.94")
+      (
+        stdenv.hostPlatform.isLinux
+        && finalAttrs.doInstallCheck
+        && lib.versionAtLeast version "2.94"
+        && lib.versionOlder version "2.95"
+      )
       [
         (lib.mesonOption "build-test-shell" "${pkgsStatic.busybox}/bin")
+      ]
+  ++
+    lib.optionals
+      (stdenv.hostPlatform.isLinux && finalAttrs.doInstallCheck && lib.versionAtLeast version "2.95")
+      [
+        (lib.mesonOption "build-test-env" "${pkgsStatic.busybox}/bin")
+        (lib.mesonOption "build-test-shell" "${pkgsStatic.bash}/bin")
       ];
 
   ninjaFlags = [ "-v" ];
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 80df0b52c248..814bd457e050 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -265,14 +265,14 @@ lib.makeExtensible (
       attrName = "git";
 
       lix-args = rec {
-        version = "2.95.0-pre-20251121_${builtins.substring 0 12 src.rev}";
+        version = "2.95.0-pre-20260103_${builtins.substring 0 12 src.rev}";
 
         src = fetchFromGitea {
           domain = "git.lix.systems";
           owner = "lix-project";
           repo = "lix";
-          rev = "b707403a308030739dfeacc5b0aaaeef8ba3f633";
-          hash = "sha256-kas7FT2J86DVJlPH5dNNHM56OgdQQyfCE/dX/EOKDp8=";
+          rev = "d387c9113c73f04bed46dbdd59b6c36de2253d73";
+          hash = "sha256-jYUcmXA4FNwoJtxRgH+Be96wQv8h9Y9dByYf+KmcgK4=";
         };
 
         cargoDeps = rustPlatform.fetchCargoVendor {
@@ -280,8 +280,6 @@ lib.makeExtensible (
           inherit src;
           hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
         };
-
-        patches = [ lixMdbookPatch ];
       };
     };