pyrox.dev / nixpkgs
lol
fork atom

nixos/btrfs: use sha256 instead of sha256_generic

Upstream dropped `sha256_generic` in https://github.com/torvalds/linux/commit/e96cb9507f2d8ba150d417dcd283204564945831

Quoting from upstream:

> sha256_blocks_generic() is moved from lib/crypto/sha256-generic.c into
lib/crypto/sha256.c. It's now a static function marked with
__maybe_unused, so the compiler automatically eliminates it in any
cases where it's not used.

Co-authored-by: dramforever <dramforever@live.com>

Guanran Wang 7faeef0e 6f1ff1f4

options
unified split
Changed files
+3 -1
nixos
modules
tasks
filesystems
btrfs.nix
+3 -1
nixos/modules/tasks/filesystems/btrfs.nix 
···

       
82

       
82

       
 

       
        # Needed for mounting filesystems with new checksums


     

       
83

       
83

       
 

       
        "xxhash_generic"


     

       
84

       
84

       
 

       
        "blake2b_generic"


     

       
85

       

       
-

       
        "sha256_generic" # Should be baked into our kernel, just to be sure


     

       

       
85

       
+

       



     

       

       
86

       
+

       
        # `sha256` is always available, whereas `sha256_generic` is not available from 6.17 onwards


     

       

       
87

       
+

       
        "sha256" # Should be baked into our kernel, just to be sure


     

       
86

       
88

       
 

       
      ];


     

       
87

       
89

       
 

       



     

       
88

       
90

       
 

       
      boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''