diff options
Diffstat (limited to 'pkgs/tools/filesystems/bcachefs-tools/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 2c54d4be614..a121a2c6d93 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -16,23 +16,16 @@ , fuse3 , cargo , rustc -, coreutils , rustPlatform , makeWrapper , fuseSupport ? false +, version ? lib.importJSON ./version.json }: -let - rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe"; -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2023-06-28"; + version = "unstable-${version.date}"; - src = fetchFromGitHub { - owner = "koverstreet"; - repo = "bcachefs-tools"; - inherit rev; - hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I="; - }; + src = fetchFromGitHub (builtins.removeAttrs version ["date"]); nativeBuildInputs = [ pkg-config @@ -70,11 +63,11 @@ in stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" - "VERSION=${lib.strings.substring 0 7 rev}" + "VERSION=${lib.strings.substring 0 7 version.rev}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; - preCheck = lib.optionalString fuseSupport '' + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; @@ -83,11 +76,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; { |