[Backport release-26.05] bcachefs-tools: 1.38.6 -> 1.38.8; linuxPackages.bcachefs: build with rust support, support kernel 7.2 (#538366)

This commit is contained in:
Masum Reza 2026-07-05 06:05:39 +00:00 committed by GitHub
commit 19e56cb98c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions

View file

@ -4,6 +4,7 @@ bcachefs-tools:
stdenv,
kernelModuleMakeFlags,
kernel,
rustPlatform,
}:
stdenv.mkDerivation {
@ -27,6 +28,7 @@ stdenv.mkDerivation {
makeFlags = kernelModuleMakeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=${placeholder "out"}"
"RUST_LIB_SRC=${rustPlatform.rustLibSrc}"
];
installPhase = ''
@ -50,6 +52,6 @@ stdenv.mkDerivation {
platforms
;
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.2");
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.3");
};
}

View file

@ -19,6 +19,7 @@
cargo,
rustc,
rustPlatform,
rust-bindgen,
makeWrapper,
nix-update-script,
versionCheckHook,
@ -30,18 +31,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.38.6";
version = "1.38.8";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-VNY9kURuXky504utCZ0Ye76mDG2TFAdzrgYI2iup/PI=";
hash = "sha256-9sDE7ua3WMCfV9ZbwQdAbpatv2IhvcwHzzPr+/l2au0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-rajYbfE98j/YqniUoV66LHh22PwEc6sWWJ/7bgGgGtA=";
hash = "sha256-F1+FeAlYSqOxeWJI8vHShpXrOZqYXjNGvty/s6f6u8w=";
};
postPatch = ''
@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
rustc
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
rust-bindgen
makeWrapper
installShellFiles
];