diff options
Diffstat (limited to 'pkgs/tools/filesystems/bcachefs-tools/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 81152d144aa..8ea406a5f1f 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -12,32 +12,29 @@ , lz4 , attr , udev -, valgrind , nixosTests , fuse3 , cargo , rustc -, coreutils , rustPlatform , makeWrapper , fuseSupport ? false }: let - rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe"; -in stdenv.mkDerivation { + rev = "6b175a022496572416918bd38d083120c23ba5f2"; +in +stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2023-06-28"; + version = "unstable-2023-09-29"; + src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; inherit rev; - hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I="; + hash = "sha256-qC6Bq2zdO8Tj+bZbIUvcVBqvuKccqDEX3HIeOXsEloQ="; }; - # errors on fsck_err function. Maybe miss-detection? - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - nativeBuildInputs = [ pkg-config cargo @@ -71,7 +68,6 @@ in stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - nativeCheckInputs = [ valgrind ]; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -79,7 +75,7 @@ in stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; - preCheck = lib.optionalString fuseSupport '' + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; @@ -88,11 +84,6 @@ in stdenv.mkDerivation { inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; - postFixup = '' - wrapProgram $out/bin/mount.bcachefs \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ''; - enableParallelBuilding = true; meta = with lib; { |