diff options
author | Edmund Wu <fangkazuto@gmail.com> | 2019-10-18 16:47:24 -0400 |
---|---|---|
committer | Edmund Wu <fangkazuto@gmail.com> | 2020-03-26 12:12:27 -0400 |
commit | 3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8 (patch) | |
tree | db1031bc61323df2ca40ef4b85de2f40b6b0bc59 /pkgs/tools | |
parent | e003ae18745ba1d68eeded53ac962268a33b207e (diff) | |
download | nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar.gz nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar.bz2 nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar.lz nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar.xz nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.tar.zst nixlib-3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8.zip |
bcachefs-tools: 2019-10-12 -> 2020-03-25
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 144ed0a38459..4c004e95e245 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,27 +1,55 @@ { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4 }: +, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +, fuseSupport ? false, fuse3 ? null }: + +assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2019-10-12"; + version = "2020-03-25"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26"; - sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967"; + rev = "2aed686c235a7d08adf601f147f823eb62e697a1"; + sha256 = "0prr8m6lwsabflslvi9j906wlm6m052zgi480y3gbkdm1sqcfjcs"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - preInstall = '' + postPatch = '' substituteInPlace Makefile \ + --replace "pytest-3" "pytest --verbose" \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + libuuid libscrypt libsodium keyutils liburcu zlib libaio + zstd lz4 python3Packages.pytest + ] ++ stdenv.lib.optional fuseSupport fuse3; + + doCheck = true; + + checkFlags = [ + "BCACHEFS_TEST_USE_VALGRIND=no" + ]; + + checkInputs = [ + valgrind + ]; + + preCheck = stdenv.lib.optionalString fuseSupport '' + rm tests/test_fuse.py + ''; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; |