From 5cb52cc7cbffb91ad503eac54045da3bd31ca69d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 11 Nov 2009 23:54:54 +0000 Subject: [PATCH] nixos vms tests: use relative path to services, nixpkgs because this is more like to work if you don't put the repos in /etc/nixos/ svn path=/nixos/trunk/; revision=18330 --- lib/build-vms.nix | 4 ++-- lib/eval-config.nix | 2 +- tests/kde4.nix | 4 ++-- tests/subversion.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/build-vms.nix b/lib/build-vms.nix index e8b21fb6dfd..2989708bdc8 100644 --- a/lib/build-vms.nix +++ b/lib/build-vms.nix @@ -1,6 +1,6 @@ { nixos ? ./.. -, nixpkgs ? /etc/nixos/nixpkgs -, services ? /etc/nixos/services +, nixpkgs ? ../../nixpkgs +, services ? ../../nixos/services , system ? builtins.currentSystem }: diff --git a/lib/eval-config.nix b/lib/eval-config.nix index 10efb8a251d..a0d34b4701f 100644 --- a/lib/eval-config.nix +++ b/lib/eval-config.nix @@ -4,7 +4,7 @@ { system ? builtins.currentSystem , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs -, services ? /etc/nixos/services +, services ? ../../services , pkgs ? null , baseModules ? import ../modules/module-list.nix , extraArgs ? {} diff --git a/tests/kde4.nix b/tests/kde4.nix index 0cff2d4eec0..3dc5e35a1c5 100644 --- a/tests/kde4.nix +++ b/tests/kde4.nix @@ -1,6 +1,6 @@ { nixos ? ./.. -, nixpkgs ? /etc/nixos/nixpkgs -, services ? /etc/nixos/services +, nixpkgs ? ../../nixpkgs +, services ? ../../nixos/services , system ? builtins.currentSystem }: diff --git a/tests/subversion.nix b/tests/subversion.nix index 82ada4576eb..c49d74f5975 100644 --- a/tests/subversion.nix +++ b/tests/subversion.nix @@ -1,6 +1,6 @@ { nixos ? ./.. -, nixpkgs ? /etc/nixos/nixpkgs -, services ? /etc/nixos/services +, nixpkgs ? ../../nixpkgs +, services ? ../../services , system ? builtins.currentSystem }: