diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 555f22a151a9..e4ae71d843ee 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -340,7 +340,7 @@ - Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details. -- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module is unmaintained and users are strongly recommended to switch to kernels that support the out-of-tree module. +- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module has been removed, and users will need to switch to kernels that support the out-of-tree module. - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server. diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index bbd9b40ad8e5..362f6ff32b10 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -242,14 +242,6 @@ in } ]; - warnings = lib.mkIf cfg.modulePackage.meta.broken [ - '' - Using unmaintained in-tree bcachefs kernel module. This - will be removed in 26.05. Please use a kernel supported - by the out-of-tree module package. - '' - ]; - # Bcachefs upstream recommends using the latest kernel boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; @@ -257,9 +249,7 @@ in system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [ - cfg.modulePackage - ]; + boot.extraModulePackages = [ cfg.modulePackage ]; systemd = { packages = [ cfg.package ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fdb300836d80..9fe615ccf5e4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -714,8 +714,8 @@ let BTRFS_FS_POSIX_ACL = yes; - BCACHEFS_QUOTA = whenBetween "6.7" "6.18" (option yes); - BCACHEFS_POSIX_ACL = whenBetween "6.7" "6.18" (option yes); + # Provided by external module + BCACHEFS_FS = whenBetween "6.7" "6.18" no; UBIFS_FS_ADVANCED_COMPR = option yes;