commit aec87d52f4d7576ec1e3587b52086701f071113c · pyrox.dev/nixpkgs

+16 -4

nixos/modules/tasks/filesystems/bcachefs.nix

···

       178
       178
        
       in

     

       179
       179
        
       

     

       180
       180
        
       {

     

       181
       181
       -
         options.boot.bcachefs.package = lib.mkPackageOption pkgs "bcachefs-tools" { } // {

     

       182
       182
       -
           description = "Configured Bcachefs userspace package.";

     

       181
       181
       +
         options.boot.bcachefs = {

     

       182
       182
       +
           package = lib.mkPackageOption pkgs "bcachefs-tools" {

     

       183
       183
       +
             extraDescription = ''

     

       184
       184
       +
               This package should also provide a passthru 'kernelModule'

     

       185
       185
       +
               attribute to build the out-of-tree kernel module.

     

       186
       186
       +
             '';

     

       187
       187
       +
           };

     

       188
       188
       +
       

     

       189
       189
       +
           modulePackage = lib.mkOption {

     

       190
       190
       +
             type = lib.types.package;

     

       191
       191
       +
             # See NOTE in linux-kernels.nix

     

       192
       192
       +
             default = config.boot.kernelPackages.callPackage cfg.package.kernelModule { };

     

       193
       193
       +
             internal = true;

     

       194
       194
       +
           };

     

       183
       195
        
         };

     

       184
       196
        
       

     

       185
       197
        
         options.services.bcachefs.autoScrub = {

     
···

       245
       257
        
               system.fsPackages = [ cfg.package ];

     

       246
       258
        
               services.udev.packages = [ cfg.package ];

     

       247
       259
        
       

     

       248
       248
       -
               boot.extraModulePackages = lib.optionals (!config.boot.kernelPackages.bcachefs.meta.broken) [

     

       249
       249
       -
                 config.boot.kernelPackages.bcachefs

     

       260
       260
       +
               boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [

     

       261
       261
       +
                 cfg.modulePackage

     

       250
       262
        
               ];

     

       251
       263
        
       

     

       252
       264
        
               systemd = {

+3

pkgs/by-name/bc/bcachefs-tools/package.nix

···

       118
       118
        
         '';

     

       119
       119
        
       

     

       120
       120
        
         passthru = {

     

       121
       121
       +
           # See NOTE in linux-kernels.nix

     

       122
       122
       +
           kernelModule = import ./kernel-module.nix finalAttrs.finalPackage;

     

       123
       123
       +
       

     

       121
       124
        
           tests = {

     

       122
       125
        
             version = testers.testVersion {

     

       123
       126
        
               package = finalAttrs.finalPackage;

+1 -1

pkgs/os-specific/linux/bcachefs-kernel-module/default.nix pkgs/by-name/bc/bcachefs-tools/kernel-module.nix

···

       1
       1
       +
       bcachefs-tools:

     

       1
       2
        
       {

     

       2
       3
        
         lib,

     

       3
       4
        
         stdenv,

     

       4
       4
       -
         bcachefs-tools,

     

       5
       5
        
         kernelModuleMakeFlags,

     

       6
       6
        
         kernel,

     

       7
       7
        
       }:

+5 -1

pkgs/top-level/linux-kernels.nix

···

       375
       375
        
       

     

       376
       376
        
               bbswitch = callPackage ../os-specific/linux/bbswitch { };

     

       377
       377
        
       

     

       378
       378
       -
               bcachefs = callPackage ../os-specific/linux/bcachefs-kernel-module { };

     

       378
       378
       +
               # NOTE: The bcachefs module is called this way to facilitate

     

       379
       379
       +
               # easy overriding, as it is expected many users will want to

     

       380
       380
       +
               # pull from the upstream git repo, which may include

     

       381
       381
       +
               # unreleased changes to the module build process.

     

       382
       382
       +
               bcachefs = callPackage pkgs.bcachefs-tools.kernelModule { };

     

       379
       383
        
       

     

       380
       384
        
               ch9344 = callPackage ../os-specific/linux/ch9344 { };

     

       381
       385