df0d321 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #123765 from hyperfekt/update-bcachefs

commitdf0d321258a9b35c36cd9d8688985502d464105f authorSandro <sandro.jaeckel@gmail.com> dateFri 9 Jul 2021, 16:30 (5 years ago) parent84eb078 12cee96

3 files changed+58−35

compare with master

unifiedsplit

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+29−20 pkgs/tools/filesystems/bcachefs-tools/default.nix+26−10 pkgs/top-level/all-packages.nix+3−5

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+29−20

@@ -1,24 +1,33 @@

1−{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:

1+{ lib

2+, fetchpatch

3+, kernel

4+, date ? "2021-07-08"

5+, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"

6+, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"

7+, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

8+, argsOverride ? {}

9+, ...

10+} @ args:

211

3−buildLinux (args // {

4− version = "5.9.0-2020.11.20";

5− modDirVersion = "5.9.0";

12+kernel.override ( args // {

613

7− src = fetchFromGitHub {

8− owner = "koverstreet";

9− repo = "bcachefs";

10− # commit does not exist on any branch on the target repository

11− rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc";

12− sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc";

13− };

14+ argsOverride = {

15+ version = "${kernel.version}-bcachefs-unstable-${date}";

16+ extraMeta = {

17+ branch = "master";

18+ maintainers = with lib.maintainers; [ davidak chiiruno ];

19+ platforms = [ "x86_64-linux" ];

20+ };

21+ } // argsOverride;

1422

15− extraConfig = "BCACHEFS_FS m";

23+ kernelPatches = [ {

24+ name = "bcachefs-${commit}";

25+ patch = fetchpatch {

26+ name = "bcachefs-${commit}.diff";

27+ url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}";

28+ sha256 = diffHash;

29+ };

30+ extraConfig = "BCACHEFS_FS m";

31+ } ] ++ kernelPatches;

1632

17− extraMeta = {

18− branch = "master";

19− hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?

20− maintainers = with lib.maintainers; [ davidak chiiruno ];

21− platforms = [ "x86_64-linux" ];

22− };

23−

24−} // (args.argsOverride or {}))

33+})

pkgs/tools/filesystems/bcachefs-tools/default.nix+26−10

@@ -1,18 +1,34 @@

1−{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils

2−, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests

3−, fuseSupport ? false, fuse3 ? null }:

4−

5−assert fuseSupport -> fuse3 != null;

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, pkg-config

5+, docutils

6+, libuuid

7+, libscrypt

8+, libsodium

9+, keyutils

10+, liburcu

11+, zlib

12+, libaio

13+, zstd

14+, lz4

15+, python3Packages

16+, udev

17+, valgrind

18+, nixosTests

19+, fuse3

20+, fuseSupport ? false

21+}:

622

723stdenv.mkDerivation {

824 pname = "bcachefs-tools";

9− version = "2020-11-17";

25+ version = "unstable-2021-07-08";

1026

1127 src = fetchFromGitHub {

1228 owner = "koverstreet";

1329 repo = "bcachefs-tools";

14− rev = "41bec63b265a38dd9fa168b6042ea5bf07135048";

15− sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj";

30+ rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";

31+ sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";

1632 };

1733

1834 postPatch = ''

@@ -22,7 +38,7 @@ stdenv.mkDerivation {

2238 "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"

2339 '';

2440

25− nativeBuildInputs = [ pkg-config ];

41+ nativeBuildInputs = [ pkg-config docutils ];

2642

2743 buildInputs = [

2844 libuuid libscrypt libsodium keyutils liburcu zlib libaio

@@ -48,6 +64,6 @@ stdenv.mkDerivation {

4864 homepage = "https://bcachefs.org/";

4965 license = licenses.gpl2;

5066 maintainers = with maintainers; [ davidak chiiruno ];

51− platforms = platforms.linux;

67+ platforms = [ "x86_64-linux" ]; # does not build on aarch64, see https://github.com/koverstreet/bcachefs-tools/issues/39

5268 };

5369}

pkgs/top-level/all-packages.nix+3−5

@@ -20856,11 +20856,9 @@ in

2085620856 ];

2085720857 };

2085820858

20859− linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {

20860− kernelPatches =

20861− [ kernelPatches.bridge_stp_helper

20862− kernelPatches.request_key_helper

20863− ];

20859+ linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {

20860+ kernel = linux_5_13;

20861+ kernelPatches = kernel.kernelPatches;

2086420862 };

2086520863

2086620864 linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {