From 4134db36d021b4715bdf0f4e54caee6d1255ee5e Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Thu, 31 Aug 2017 05:17:54 -0500
Subject: [PATCH] linux-testing-bcachefs: init at 4.11.2017.08.23

---
 .../linux/kernel/linux-testing-bcachefs.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 18 ++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
new file mode 100644
index 000000000000..77a2b62dbb4f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -0,0 +1,28 @@
+{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.11.2017.08.23";
+  modDirVersion = "4.11.0";
+  extraMeta.branch = "master";
+  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
+
+  src = fetchgit {
+    url = "https://evilpiepirate.org/git/bcachefs.git";
+    rev = "fb8082a13d49397346a04ce4d3904569b0287738";
+    sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid";
+  };
+
+  extraConfig = ''
+    BCACHEFS_FS m
+  '';
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+
+  # Should the testing kernels ever be built on Hydra?
+  extraMeta.hydraPlatforms = [];
+
+} // (args.argsOverride or {}))
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d486de46873..141c024ed645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12185,6 +12185,21 @@ with pkgs;
     ];
   };
 
+  linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        kernelPatches.p9_fixes
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
 
   linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
     kernelPatches =
@@ -12371,6 +12386,9 @@ with pkgs;
       allowImportFromDerivation = true;
     }));
 
+  # Build a kernel with bcachefs module
+  linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);
+
   # Build a kernel for Xen dom0
   linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));