From 640428d3c515c1837c9c2bff28f765d53fc93355 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 20 Dec 2014 19:16:43 +0100
Subject: [PATCH 1/3] nixos-option: Handle 'attrsOf submodule' options.

---
 nixos/modules/installer/tools/nixos-option.sh | 78 ++++++++++++++++---
 1 file changed, 66 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 4478059813d..e565eca9720 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -83,6 +83,58 @@ EOF
   fi
 }
 
+header="
+let
+  nixos = import <nixos> {};
+  nixpkgs = import <nixpkgs> {};
+in with nixpkgs.lib;
+"
+
+# This function is used for converting the option definition path given by
+# the user into accessors for reaching the definition and the declaration
+# corresponding to this option.
+generateAccessors(){
+  evalNix --strict --show-trace <<EOF
+$header
+
+let
+  path = "${option:+$option}";
+  pathList = splitString "." path;
+
+  walkOptions = attrsNames: result:
+    if attrsNames == [] then
+      result
+    else
+      let name = head attrsNames; rest = tail attrsNames; in
+      if isOption result.options then
+        walkOptions rest {
+          options = result.options.type.getSubOptions "";
+          opt = ''(\${result.opt}.type.getSubOptions "")'';
+          cfg = ''\${result.cfg}."\${name}"'';
+        }
+      else
+        walkOptions rest {
+          options = result.options.\${name};
+          opt = ''\${result.opt}."\${name}"'';
+          cfg = ''\${result.cfg}."\${name}"'';
+        }
+    ;
+
+  walkResult = (if path == "" then x: x else walkOptions pathList) {
+    options = nixos.options;
+    opt = ''nixos.options'';
+    cfg = ''nixos.config'';
+  };
+
+in
+  ''let option = \${walkResult.opt}; config = \${walkResult.cfg}; in''
+EOF
+}
+
+header="$header
+$(eval echo $(generateAccessors))
+"
+
 evalAttr(){
   local prefix="$1"
   local strict="$2"
@@ -92,10 +144,10 @@ evalAttr(){
   test -n "$strict" && strict=true
 
   evalNix ${strict:+--strict} <<EOF
+$header
+
 let
-  reach = attrs: attrs${option:+.$option}${suffix:+.$suffix};
-  nixos = import <nixos> {};
-  nixpkgs = import <nixpkgs> {};
+  value = $prefix${suffix:+.$suffix};
   strict = ${strict:-false};
   cleanOutput = x: with nixpkgs.lib;
     if isDerivation x then x.outPath
@@ -106,12 +158,12 @@ let
       else x
     else x;
 in
-  cleanOutput (reach nixos.$prefix)
+  cleanOutput value
 EOF
 }
 
 evalOpt(){
-  evalAttr "options" "" "$@"
+  evalAttr "option" "" "$@"
 }
 
 evalCfg(){
@@ -121,8 +173,11 @@ evalCfg(){
 
 findSources(){
   local suffix=$1
-  echo "(import <nixos> {}).options${option:+.$option}.$suffix" |
-    evalNix --strict
+  evalNix --strict <<EOF
+$header
+
+option.$suffix
+EOF
 }
 
 # Given a result from nix-instantiate, recover the list of attributes it
@@ -152,13 +207,12 @@ nixMap() {
 # the output of nixos-option with other tools such as nixos-gui.
 if $xml; then
   evalNix --xml --no-location <<EOF
+$header
+
 let
-  reach = attrs: attrs${option:+.$option};
-  nixos = import <nixos> {};
-  nixpkgs = import <nixpkgs> {};
   sources = builtins.map (f: f.source);
-  opt = reach nixos.options;
-  cfg = reach nixos.config;
+  opt = option;
+  cfg = config;
 in
 
 with nixpkgs.lib;

From c9682a22ffc93a89b66c12cc4df7d0e022d17043 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 20 Dec 2014 19:52:28 +0100
Subject: [PATCH 2/3] nixos-option: Produce nicer error messages in case of
 typos.

---
 nixos/modules/installer/tools/nixos-option.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index e565eca9720..ffd624227fb 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -94,7 +94,7 @@ in with nixpkgs.lib;
 # the user into accessors for reaching the definition and the declaration
 # corresponding to this option.
 generateAccessors(){
-  evalNix --strict --show-trace <<EOF
+  if result=$(evalNix --strict --show-trace <<EOF
 $header
 
 let
@@ -129,6 +129,17 @@ let
 in
   ''let option = \${walkResult.opt}; config = \${walkResult.cfg}; in''
 EOF
+)
+  then
+      echo $result
+  else
+      # In case of error we want to ignore the error message roduced by the
+      # script above, as it is iterating over each attribute, which does not
+      # produce a nice error message.  The following code is a fallback
+      # solution which is cause a nicer error message in the next
+      # evaluation.
+      echo "\"let option = nixos.options${option:+.$option}; config = nixos.config${option:+.$option}; in\""
+  fi
 }
 
 header="$header

From 974edc5056616e3a6250277459f40974dfeba705 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 21 Dec 2014 01:33:06 +0100
Subject: [PATCH 3/3] nixos-option: Use <nixpkgs/nixos> instead of <nixpkgs>.

---
 nixos/modules/installer/tools/nixos-option.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index ffd624227fb..3016536ecdd 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -83,9 +83,8 @@ EOF
   fi
 }
 
-header="
-let
-  nixos = import <nixos> {};
+header="let
+  nixos = import <nixpkgs/nixos> {};
   nixpkgs = import <nixpkgs> {};
 in with nixpkgs.lib;
 "