From 9b53e33ffcadf6f7cfaac4f1e4c8df2cdd736c90 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Apr 2018 03:18:56 +0200 Subject: 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 --- release.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 46e1edf2..e55b45fa 100644 --- a/release.nix +++ b/release.nix @@ -40,8 +40,9 @@ let mpath = if vuizvuiSrc == null then ./machines else "${vuizvui}/machines"; allMachines = with pkgsUpstream.lib; let - wrapPkgs = machine: machine.withPkgsPath nixpkgs; - in mapAttrsRecursiveCond (m: !(m ? eval)) (const wrapPkgs) (import mpath); + wrapPkgs = machine: machine.__withPkgsPath nixpkgs; + condition = m: !(m ? __withPkgsPath); + in mapAttrsRecursiveCond condition (const wrapPkgs) (import mpath); allTests = with import ./lib; getVuizvuiTests ({ inherit system nixpkgs; -- cgit 1.4.1