Allow evaluating a device from a path

This allows external device definitions to be used.
NixOS · Jun 6, 2020 · feb1f4a · feb1f4a
1 parent fda130f
commit feb1f4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/default.nix b/default.nix
@@ -64,6 +64,8 @@ in
     if device == null then (id: id) else
     if device ? special
     then header "Evaluating: ${device.name}"
+    else if (builtins.tryEval (builtins.pathExists device)).value
+    then header "Evaluating device from path: ${toString device}"
     else header "Evaluating device: ${device}"
   )
 {

diff --git a/lib/release-tools.nix b/lib/release-tools.nix
@@ -20,6 +20,7 @@
     modules =
       (if device ? special
       then [ device.config ]
+      else if builtins.isPath device then [ { imports = [ device ]; } ]
       else [ { imports = [(../. + "/devices/${device}")]; } ])
       ++ modules
       ++ [ additionalConfiguration ]