commit 890cf0a79c936c49b06513e23cec7d375c456f7d · pyrox.dev/nixpkgs

+26 -3

nixos/modules/tasks/filesystems/bcachefs.nix

···

       88
       88
        
           };

     

       89
       89
        
         };

     

       90
       90
        
       

     

       91
       91
       +
         assertions = [

     

       92
       92
       +
           {

     

       93
       93
       +
             assertion = let

     

       94
       94
       +
               kernel = config.boot.kernelPackages.kernel;

     

       95
       95
       +
             in (

     

       96
       96
       +
               kernel.kernelAtLeast "6.7" || (

     

       97
       97
       +
                 lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [

     

       98
       98
       +
                   lib.kernel.module

     

       99
       99
       +
                   lib.kernel.yes

     

       100
       100
       +
                   lib.kernel.option.yes

     

       101
       101
       +
                 ]

     

       102
       102
       +
               )

     

       103
       103
       +
             );

     

       104
       104
       +
       

     

       105
       105
       +
             message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required";

     

       106
       106
       +
           }

     

       107
       107
       +
         ];

     

       91
       108
        
       in

     

       92
       109
        
       

     

       93
       110
        
       {

     

       94
       111
        
         config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [

     

       95
       112
        
           {

     

       113
       113
       +
             inherit assertions;

     

       96
       114
        
             # needed for systemd-remount-fs

     

       97
       115
        
             system.fsPackages = [ pkgs.bcachefs-tools ];

     

       98
       116
        
       

     

       99
       99
       -
             # use kernel package with bcachefs support until it's in mainline

     

       100
       100
       -
             # TODO replace with requireKernelConfig

     

       101
       101
       -
             boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;

     

       117
       117
       +
             # FIXME: Replace this with `linuxPackages_testing` after NixOS 23.11 is released

     

       118
       118
       +
             # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7

     

       119
       119
       +
             boot.kernelPackages = lib.mkDefault (

     

       120
       120
       +
               # FIXME: Remove warning after NixOS 23.11 is released

     

       121
       121
       +
               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"

     

       122
       122
       +
               pkgs.linuxPackages_testing_bcachefs

     

       123
       123
       +
             );

     

       102
       124
        
       

     

       103
       125
        
             systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);

     

       104
       126
        
           }

     

       105
       127
        
       

     

       106
       128
        
           (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {

     

       129
       129
       +
             inherit assertions;

     

       107
       130
        
             # chacha20 and poly1305 are required only for decryption attempts

     

       108
       131
        
             boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];

     

       109
       132
        
             boot.initrd.systemd.extraBin = {

pkgs/top-level/all-packages.nix

···

       28107
       28107
        
         linuxPackages_testing = linuxKernel.packages.linux_testing;

     

       28108
       28108
        
         linux_testing = linuxKernel.kernels.linux_testing;

     

       28109
       28109
        
       

     

       28110
       28110
       +
         # FIXME: Remove and alias to `linux(Packages)_testing`` after 23.11 is released

     

       28110
       28111
        
         linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs;

     

       28111
       28112
        
         linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs;

     

       28112
       28113

pkgs/top-level/linux-kernels.nix

···

       201
       201
        
              then latest

     

       202
       202
        
              else testing;

     

       203
       203
        
       

     

       204
       204
       +
           # FIXME: Remove after 23.11 is released

     

       204
       205
        
           linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {

     

       205
       206
        
             # Pinned on the last version which Kent's commits can be cleany rebased up.

     

       206
       207
        
             kernel = linux_6_5;

     
···

       612
       613
        
       

     

       613
       614
        
           # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

     

       614
       615
        
           linux_testing = packagesFor kernels.linux_testing;

     

       616
       616
       +
           # FIXME: Remove after 23.11 is released

     

       615
       617
        
           linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs);

     

       616
       618
        
       

     

       617
       619
        
           linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);