From 39ebd5001ebcbcc9d991784ec1ce6dd804dbdcd4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 7 Jun 2016 02:15:58 +0200
Subject: getAttrDef: RIP

---
 krebs/4lib/default.nix | 1 -
 krebs/4lib/types.nix   | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/4lib')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 585bd313..e984614a 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -41,7 +41,6 @@ let out = rec {
     mapAttrs (name: _: path + "/${name}")
              (filterAttrs (_: eq "directory") (readDir path));
 
-  getAttrDef = name: set: set.${name} or set.default or null;
   mapAttrValues = f: mapAttrs (_: f);
   setAttr = name: value: set: set // { ${name} = value; };
 
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 66191d0b..f78d601e 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -199,8 +199,9 @@ types // rec {
         description = ''
           Set of user's PGP public keys.
 
-          Modules supporting PGP may use well-known key names to define option
-          defaults, e.g. using `getAttrDef well-known-name pubkeys`.
+          Modules supporting PGP may use well-known key names to define
+          default values for options, in which case the well-known name
+          should be documented in the respective option's description.
         '';
       };
       pubkey = mkOption {
-- 
cgit v1.2.3