From 2ac09578c0957422668b58c22f3ab7644afb59f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Jan 2011 11:39:03 +0000 Subject: [PATCH] * runInMachine: properly evaluate the machine configuration. svn path=/nixos/trunk/; revision=25536 --- lib/testing.nix | 4 ++-- tests/run-in-machine.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/testing.nix b/lib/testing.nix index 38e84b67ce71..999d27883e2e 100644 --- a/lib/testing.nix +++ b/lib/testing.nix @@ -167,8 +167,8 @@ rec { }: let vm = buildVM { } - [ ({ config, pkgs, ... }: { networking.hostName = "client"; }) - machine + [ machine + { key = "hostname"; networking.hostName = "client"; } ]; buildrunner = writeText "vm-build" '' diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix index 9903c37b73ab..5f790a11aba3 100644 --- a/tests/run-in-machine.nix +++ b/tests/run-in-machine.nix @@ -7,5 +7,5 @@ with import ../lib/testing.nix { inherit nixpkgs services system; }; runInMachine { drv = (import nixpkgs { }).aterm; - machine = { config, pkgs, ... }: { }; -} \ No newline at end of file + machine = { config, pkgs, ... }: { services.sshd.enable = true; }; +}