From 6e7f4f99d152fef88ed70654f7946d55d2643fcc Mon Sep 17 00:00:00 2001
From: Niklas Hambüchen <mail@nh2.me>
Date: Mon, 7 May 2018 00:35:45 +0200
Subject: manual: Document `types.attrs`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/doc/manual/development/option-types.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nixos')

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
@@ -21,6 +21,15 @@
   </para>
 
   <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>
-- 
cgit 1.4.1


From 5855459f49b56a0f4e59a08583be1d1f5d111c47 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 7 May 2018 01:42:37 +0200
Subject: modules/system/boot/luksroot: remove comment about input_leds for
 caps lock

Since f2a9f9aeab5016d28ab4bcf6da81924ceecdd676, we already load
"input_leds", so this comment isn't useful anymore.
---
 nixos/modules/system/boot/luksroot.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nixos')

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
-- 
cgit 1.4.1


From e711da345ca51744b37aa9249bb84d4faea10082 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Oct 2017 17:58:59 +0300
Subject: base profile: add mkpasswd to system packages

Allows the user to generate password hashes for the installed system easier.
---
 nixos/modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nixos')

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
-- 
cgit 1.4.1