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

Merge #97599: bcachefs*: update

Browse Source
This commit is contained in:
Vladimír Čunát 2020-09-17 23:19:07 +02:00
commit 638c8cb2d5
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,14 @@
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: { stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
buildLinux (args // { buildLinux (args // {
version = "5.3.2020.04.04"; version = "5.8.0-2020.09.07";
modDirVersion = "5.3.0"; modDirVersion = "5.8.0";
src = fetchgit { src = fetchFromGitHub {
url = "https://evilpiepirate.org/git/bcachefs.git"; owner = "koverstreet";
rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; repo = "bcachefs";
sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf";
sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy";
}; };
extraConfig = "BCACHEFS_FS m"; extraConfig = "BCACHEFS_FS m";

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

@ -1,17 +1,18 @@
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils { stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages , liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages
, fuseSupport ? false, fuse3 ? null }: , fuseSupport ? false, fuse3 ? null }:
assert fuseSupport -> fuse3 != null; assert fuseSupport -> fuse3 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
version = "2020-04-04"; version = "2020-08-25";
src = fetchgit { src = fetchFromGitHub {
url = "https://evilpiepirate.org/git/bcachefs-tools.git"; owner = "koverstreet";
rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; repo = "bcachefs-tools";
sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; rev = "487ddeb03c574e902c5b749b4307e87e2150976a";
sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";
}; };
postPatch = '' postPatch = ''
@ -29,10 +30,10 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
libuuid libscrypt libsodium keyutils liburcu zlib libaio libuuid libscrypt libsodium keyutils liburcu zlib libaio
zstd lz4 python3Packages.pytest zstd lz4 python3Packages.pytest udev valgrind
] ++ stdenv.lib.optional fuseSupport fuse3; ] ++ stdenv.lib.optional fuseSupport fuse3;
doCheck = true; doCheck = false; # needs bcachefs module loaded on builder
checkFlags = [ checkFlags = [
"BCACHEFS_TEST_USE_VALGRIND=no" "BCACHEFS_TEST_USE_VALGRIND=no"