From 3752bfd2199aaed83595b2d7c8a6d0f8cbcf64d8 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 18 Oct 2019 16:47:24 -0400 Subject: [PATCH 1/4] bcachefs-tools: 2019-10-12 -> 2020-03-25 --- .../filesystems/bcachefs-tools/default.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 144ed0a3845..4c004e95e24 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/; From 00e7a675f77a11c7a42c7b94fc95feb645f317c3 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 18 Oct 2019 16:49:09 -0400 Subject: [PATCH 2/4] linux_testing_bcachefs: 5.2.2019.10.12 -> 5.3.2020.03.25 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index f4b9e5b8da6..8d3e182c17e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.2.2019.10.12"; - modDirVersion = "5.2.0"; + version = "5.3.2020.03.25"; + modDirVersion = "5.3.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "de906c3e2eddad291d46bd0e7c81c68eaadcd08a"; - sha256 = "1ahabp8pd9slf4lchkbyfkagg9vhic0cw3kwvwryzaxxxjmf2hkk"; + rev = "96b991466ac851ea3c7adbd2e30184837573e2a0"; + sha256 = "1x6h2p8j8n727jywyc24k81i169xj645pb5wav3hvn57qja1z3b3"; }; extraConfig = "BCACHEFS_FS m"; From b4e12243b4f1c02984ad795063cec297f9315d98 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 6 Apr 2020 10:28:57 -0400 Subject: [PATCH 3/4] bcachefs: 2020-03-25 -> 2020-04-04 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 4c004e95e24..ad159f08872 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -6,12 +6,12 @@ assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-03-25"; + version = "2020-04-04"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "2aed686c235a7d08adf601f147f823eb62e697a1"; - sha256 = "0prr8m6lwsabflslvi9j906wlm6m052zgi480y3gbkdm1sqcfjcs"; + rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; + sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; }; postPatch = '' From 04a5e5ab7c77361a9891fcc3bc0e32748b43d05f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 6 Apr 2020 10:29:11 -0400 Subject: [PATCH 4/4] linux_testing_bcachefs: 5.3.2020.03.25 -> 5.3.2020.04.04 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 8d3e182c17e..456913c5e6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.3.2020.03.25"; + version = "5.3.2020.04.04"; modDirVersion = "5.3.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "96b991466ac851ea3c7adbd2e30184837573e2a0"; - sha256 = "1x6h2p8j8n727jywyc24k81i169xj645pb5wav3hvn57qja1z3b3"; + rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; + sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; }; extraConfig = "BCACHEFS_FS m";