diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
| commit | a18b493e022a4d94916b2d73198b29ff1a241114 (patch) | |
| tree | e6f69c279e63f753e958773e854caeb934ac770c /nixos | |
| parent | 8ff2dca3884b99799d90e0a025de59552161eebf (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
| download | nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.gz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.bz2 nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.lz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.xz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.zst nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.zip | |
Merge master into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/development/option-types.xml | 9 | ||||
| -rw-r--r-- | nixos/modules/profiles/base.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7969d8124738..5cb747e6d9f1 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -22,6 +22,15 @@ <variablelist> <varlistentry> + <term><varname>types.attrs</varname> + </term> + <listitem> + <para> + A free-form attribute set. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><varname>types.bool</varname> </term> <listitem> diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3bf06a951193..52481d90eab9 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -17,6 +17,7 @@ pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes + pkgs.mkpasswd # for generating password files # Some networking tools. pkgs.fuse diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 54dfb53fd30f..7ebfdb134d7d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -454,7 +454,6 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] ++ luks.cryptoModules # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged |