diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index f792ad9b561d..7e0ddc4f4846 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 @@ -295,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" ]; @@ -347,7 +358,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" 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 ]; }; };