diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index 614410a039aa..6310280b1dec 100644 --- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -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"); }; } diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index e1c2935d906d..887fe38cecdf 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -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 ];