diff options
author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
tree | d3af676b9948c865f1e942e1db51862da5e19ad5 /nixos/lib | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/testing.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 063b9bf6c7af..0e23fc5d187d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -117,7 +117,7 @@ rec { report = releaseTools.gcovReport { coverageRuns = [ test ]; }; - in (if makeCoverageReport then report else test) // { inherit driver test; }; + in (if makeCoverageReport then report else test) // { inherit nodes driver test; }; runInMachine = |