From 9971dd1a6af1c1627dcb137dd8340514683d778d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 07:42:36 +0100 Subject: release.nix: Properly import vuizvui tests. The tests from vuizvui itself weren't properly included in release.nix, because we're patching up our own source tree and thus the evaluator is unable to find the right path. Signed-off-by: aszlig --- lib/get-tests.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/get-tests.nix b/lib/get-tests.nix index 0f93a5bb..08fc9475 100644 --- a/lib/get-tests.nix +++ b/lib/get-tests.nix @@ -1,4 +1,7 @@ -{ system ? builtins.currentSystem, nixpkgs ? import ../nixpkgs-path.nix }: +{ system ? builtins.currentSystem +, nixpkgs ? import ../nixpkgs-path.nix +, vuizvuiTests ? ../tests +}: with import "${nixpkgs}/lib"; @@ -13,7 +16,7 @@ with import "${nixpkgs}/lib"; reduce = attr: if isTestOrJob attr then attr else attr.${system}; in mapAttrsRecursiveCond cond (path: reduce) upstreamTests; - vuizvui = import ../tests { + vuizvui = import vuizvuiTests { inherit system; }; } -- cgit 1.4.1