Fix up call-network and rename withPkgsPath

Using __withPkgsPath is a way better name, because two underscores in
front of it commonly designate an internal attribute, which it is.

The callNetwork function now works in a similar vain as callMachine,
having a canonical way to specify the path to nixpkgs.

I've also changed the recursive search of machines to use the
__withPkgsPath attribute as a way to detect whether it's a machine.

Signed-off-by: aszlig <aszlig@nix.build>

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/call-machine.nix b/lib/call-machine.nix
index 8c50ce16..f500dd21 100644
--- a/lib/call-machine.nix
+++ b/lib/call-machine.nix
@@ -1,7 +1,7 @@
 path: cfg:
 
 let
-  withPkgsPath = nixpkgs: rec {
+  __withPkgsPath = nixpkgs: rec {
     eval = import "${nixpkgs}/nixos/lib/eval-config.nix" {
       modules = [ path cfg ] ++ import ../modules/module-list.nix;
     };
@@ -63,11 +63,11 @@ let
   };
 
 in rec {
-  inherit (withPkgsPath (import ../nixpkgs-path.nix))
+  inherit (__withPkgsPath (import ../nixpkgs-path.nix))
     build config eval iso installerIso vm;
 
   # This is internal only and for use with restricted evaluation mode in Hydra
   # to get the path to nixpkgs from the jobset input args instead of
   # ../nixpkgs-path.nix.
-  inherit withPkgsPath;
+  inherit __withPkgsPath;
 }