public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104197 from Chiiruno/dev/bcachefs

Browse Source 
linux_testing_bcachefs: 5.8.0-2020.09.07 -> 5.9.0-2020.11.17 // bcachefs-tools: 2020-08-25 -> 2020-11-17
This commit is contained in:
Anderson Torres 2020-12-22 11:09:43 -03:00 committed by GitHub
commit 6690232388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View File

@ -1,14 +1,14 @@
{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: { stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
buildLinux (args // { buildLinux (args // {
version = "5.8.0-2020.09.07"; version = "5.9.0-2020.11.20";
modDirVersion = "5.8.0"; modDirVersion = "5.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koverstreet"; owner = "koverstreet";
repo = "bcachefs"; repo = "bcachefs";
rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc";
sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc";
}; };
extraConfig = "BCACHEFS_FS m"; extraConfig = "BCACHEFS_FS m";

26
pkgs/tools/filesystems/bcachefs-tools/default.nix
View File

@ -6,13 +6,13 @@ assert fuseSupport -> fuse3 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
version = "2020-08-25"; version = "2020-11-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koverstreet"; owner = "koverstreet";
repo = "bcachefs-tools"; repo = "bcachefs-tools";
rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; rev = "41bec63b265a38dd9fa168b6042ea5bf07135048";
sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj";
}; };
postPatch = '' postPatch = ''
@ -22,11 +22,7 @@ stdenv.mkDerivation {
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
''; '';
enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
pkgconfig
];
buildInputs = [ buildInputs = [
libuuid libscrypt libsodium keyutils liburcu zlib libaio libuuid libscrypt libsodium keyutils liburcu zlib libaio
@ -34,22 +30,14 @@ stdenv.mkDerivation {
] ++ stdenv.lib.optional fuseSupport fuse3; ] ++ stdenv.lib.optional fuseSupport fuse3;
doCheck = false; # needs bcachefs module loaded on builder doCheck = false; # needs bcachefs module loaded on builder
checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
checkFlags = [ checkInputs = [ valgrind ];
"BCACHEFS_TEST_USE_VALGRIND=no"
];
checkInputs = [
valgrind
];
preCheck = stdenv.lib.optionalString fuseSupport '' preCheck = stdenv.lib.optionalString fuseSupport ''
rm tests/test_fuse.py rm tests/test_fuse.py
''; '';
installFlags = [ installFlags = [ "PREFIX=${placeholder "out"}" ];
"PREFIX=${placeholder "out"}"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for managing bcachefs filesystems"; description = "Tool for managing bcachefs filesystems";