lixPackageSets.git: 2.95.0-pre-20251121_b707403a3080 -> 2.95.0-pre-20260103_d387c9113c73

This commit is contained in:
Alois Wohlschlager
2026-01-04 12:03:50 +01:00
parent aba5e58b7d
commit a4620e9203
2 changed files with 16 additions and 6 deletions
@@ -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" ];
@@ -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 ];
};
};