git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #104197 from Chiiruno/dev/bcachefs

linux_testing_bcachefs: 5.8.0-2020.09.07 -> 5.9.0-2020.11.17 // bcachefs-tools: 2020-08-25 -> 2020-11-17

commit66902323886e59bec01a68fdc27768e80356eb8a authorAnderson Torres <torres.anderson.85@protonmail.com> dateTue 22 Dec 2020, 11:09 (6 years ago) parent86ff1e49bf9971
2 files changed+11−23
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+4−4 pkgs/tools/filesystems/bcachefs-tools/default.nix+7−19
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+4−4
@@ -1,14 +1,14 @@
11{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
22
33buildLinux (args // {
4− version = "5.8.0-2020.09.07";
5− modDirVersion = "5.8.0";
4+ version = "5.9.0-2020.11.20";
5+ modDirVersion = "5.9.0";
66
77 src = fetchFromGitHub {
88 owner = "koverstreet";
99 repo = "bcachefs";
10− rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf";
11− sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy";
10+ rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc";
11+ sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc";
1212 };
1313
1414 extraConfig = "BCACHEFS_FS m";
pkgs/tools/filesystems/bcachefs-tools/default.nix+7−19
@@ -6,13 +6,13 @@ assert fuseSupport -> fuse3 != null;
66
77stdenv.mkDerivation {
88 pname = "bcachefs-tools";
9− version = "2020-08-25";
9+ version = "2020-11-17";
1010
1111 src = fetchFromGitHub {
1212 owner = "koverstreet";
1313 repo = "bcachefs-tools";
14− rev = "487ddeb03c574e902c5b749b4307e87e2150976a";
15− sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";
14+ rev = "41bec63b265a38dd9fa168b6042ea5bf07135048";
15+ sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj";
1616 };
1717
1818 postPatch = ''
@@ -22,11 +22,7 @@ stdenv.mkDerivation {
2222 "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
2323 '';
2424
25− enableParallelBuilding = true;
26−
27− nativeBuildInputs = [
28− pkgconfig
29− ];
25+ nativeBuildInputs = [ pkgconfig ];
3026
3127 buildInputs = [
3228 libuuid libscrypt libsodium keyutils liburcu zlib libaio
@@ -34,22 +30,14 @@ stdenv.mkDerivation {
3430 ] ++ stdenv.lib.optional fuseSupport fuse3;
3531
3632 doCheck = false; # needs bcachefs module loaded on builder
37−
38− checkFlags = [
39− "BCACHEFS_TEST_USE_VALGRIND=no"
40− ];
41−
42− checkInputs = [
43− valgrind
44− ];
33+ checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
34+ checkInputs = [ valgrind ];
4535
4636 preCheck = stdenv.lib.optionalString fuseSupport ''
4737 rm tests/test_fuse.py
4838 '';
4939
50− installFlags = [
51− "PREFIX=${placeholder "out"}"
52− ];
40+ installFlags = [ "PREFIX=${placeholder "out"}" ];
5341
5442 meta = with stdenv.lib; {
5543 description = "Tool for managing bcachefs filesystems";