diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 37b03bc28ff9..e417ee6d389b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2021-11-06" -, commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377" -, diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw" +, date ? "2021-12-26" +, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f" +, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -13,6 +13,7 @@ (kernel.override ( args // { argsOverride = { version = "${kernel.version}-bcachefs-unstable-${date}"; + extraMeta = { branch = "master"; maintainers = with lib.maintainers; [ davidak chiiruno ]; @@ -21,12 +22,13 @@ kernelPatches = [ { name = "bcachefs-${commit}"; + patch = fetchpatch { name = "bcachefs-${commit}.diff"; url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}"; sha256 = diffHash; }; + extraConfig = "BCACHEFS_FS m"; } ] ++ kernelPatches; - }))