summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMadoura <madouura@gmail.com>2023-11-18 07:55:19 -0600
committerMadoura <madouura@gmail.com>2023-11-18 09:58:51 -0600
commit890cf0a79c936c49b06513e23cec7d375c456f7d (patch)
tree0abff427a9839b559a4aa919dc083e114cf575f7 /nixos
parent0adbda28d3a65f4ec63360819f4203646a00b867 (diff)
downloadnixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar.gz
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar.bz2
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar.lz
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar.xz
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.tar.zst
nixpkgs-890cf0a79c936c49b06513e23cec7d375c456f7d.zip
nixos/bcachefs: soft-deprecate 'linuxPackages_testing_bcachefs'
'bcachefs' is included in the linux kernel since 6.7-rc1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/tasks/filesystems/bcachefs.nix29
1 files changed, 26 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index 8036da469bc..d144ce62dc2 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -88,22 +88,45 @@ let
     };
   };
 
+  assertions = [
+    {
+      assertion = let
+        kernel = config.boot.kernelPackages.kernel;
+      in (
+        kernel.kernelAtLeast "6.7" || (
+          lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [
+            lib.kernel.module
+            lib.kernel.yes
+            lib.kernel.option.yes
+          ]
+        )
+      );
+
+      message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required";
+    }
+  ];
 in
 
 {
   config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [
     {
+      inherit assertions;
       # needed for systemd-remount-fs
       system.fsPackages = [ pkgs.bcachefs-tools ];
 
-      # use kernel package with bcachefs support until it's in mainline
-      # TODO replace with requireKernelConfig
-      boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
+      # FIXME: Replace this with `linuxPackages_testing` after NixOS 23.11 is released
+      # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7
+      boot.kernelPackages = lib.mkDefault (
+        # FIXME: Remove warning after NixOS 23.11 is released
+        lib.warn "Please upgrade to Linux 6.7-rc1 or later: 'linuxPackages_testing_bcachefs' is deprecated. Use 'boot.kernelPackages = pkgs.linuxPackages_testing;' to silence this warning"
+        pkgs.linuxPackages_testing_bcachefs
+      );
 
       systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);
     }
 
     (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
+      inherit assertions;
       # chacha20 and poly1305 are required only for decryption attempts
       boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];
       boot.initrd.systemd.extraBin = {