Unverified Commit 638c8cb2 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #97599: bcachefs*: update

parents 6bc58262 3cc3e864

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

+8 −7
Original line number Diff line number Diff line 
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:

{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:



buildLinux (args // {

  version = "5.3.2020.04.04";

  modDirVersion = "5.3.0";

  version = "5.8.0-2020.09.07";

  modDirVersion = "5.8.0";



  src = fetchgit {

    url = "https://evilpiepirate.org/git/bcachefs.git";

    rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230";

    sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x";

  src = fetchFromGitHub {

    owner = "koverstreet";

    repo = "bcachefs";

    rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf";

    sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy";

  };



  extraConfig = "BCACHEFS_FS m";

pkgs/tools/filesystems/bcachefs-tools/default.nix

+10 −9
Original line number Diff line number Diff line 
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils

, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages

{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils

, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages

, fuseSupport ? false, fuse3 ? null }:



assert fuseSupport -> fuse3 != null;



stdenv.mkDerivation {

  pname = "bcachefs-tools";

  version = "2020-04-04";

  version = "2020-08-25";



  src = fetchgit {

    url = "https://evilpiepirate.org/git/bcachefs-tools.git";

    rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d";

    sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g";

  src = fetchFromGitHub {

    owner = "koverstreet";

    repo = "bcachefs-tools";

    rev = "487ddeb03c574e902c5b749b4307e87e2150976a";

    sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid";

  };



  postPatch = ''
@@ -29,10 +30,10 @@ stdenv.mkDerivation { 


  buildInputs = [

    libuuid libscrypt libsodium keyutils liburcu zlib libaio

    zstd lz4 python3Packages.pytest

    zstd lz4 python3Packages.pytest udev valgrind

  ] ++ stdenv.lib.optional fuseSupport fuse3;



  doCheck = true;

  doCheck = false; # needs bcachefs module loaded on builder



  checkFlags = [

    "BCACHEFS_TEST_USE_VALGRIND=no"