0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-03 06:01:13 +00:00 committed by GitHub
commit 77a94d88ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 233 additions and 85 deletions

View file

@ -621,6 +621,8 @@ in
Whether to allow TRIM requests to the underlying device. This option
has security implications; please read the LUKS documentation before
activating it.
This option is incompatible with authenticated encryption (dm-crypt
stacked over dm-integrity).
'';
};