about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorRyan Lahfa <masterancpp@gmail.com>2023-07-16 17:00:10 +0200
committerGitHub <noreply@github.com>2023-07-16 17:00:10 +0200
commit6e7ca62140f17b3e9fb9933f9291a7ab740c3505 (patch)
treeb981da6a65b0a683f3b08b09f1596679d6fb81a9 /pkgs/os-specific
parent0c31721447ef3f80dbc23d53123308d2c77e37cf (diff)
parent9895d0b0c50d0db40454bc4d035cbfc2597568b8 (diff)
Merge pull request #243516 from RaitoBezarius/bcachefs-acls
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index dfe5beb55f6a5..0763ffda26b99 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -20,7 +20,13 @@
   extraMeta = {
     branch = "master";
     broken = stdenv.isAarch64;
-    maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ];
+    maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius ];
+  };
+
+  structuredExtraConfig = with lib.kernel; {
+    BCACHEFS_FS = module;
+    BCACHEFS_QUOTA = option yes;
+    BCACHEFS_POSIX_ACL = option yes;
   };
 
   kernelPatches = [ {
@@ -31,7 +37,5 @@
         url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${currentCommit}&id2=v${lib.versions.majorMinor kernel.version}";
         sha256 = diffHash;
       };
-
-      extraConfig = "BCACHEFS_FS m";
     } ] ++ kernelPatches;
 }))