Browse Source

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
nsd-state-dir
Marc Weber 13 years ago
parent
commit
5cb52cc7cb
  1. 4
      lib/build-vms.nix
  2. 2
      lib/eval-config.nix
  3. 4
      tests/kde4.nix
  4. 4
      tests/subversion.nix

4
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
}:

2
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 ? {}

4
tests/kde4.nix

@ -1,6 +1,6 @@
{ nixos ? ./..
, nixpkgs ? /etc/nixos/nixpkgs
, services ? /etc/nixos/services
, nixpkgs ? ../../nixpkgs
, services ? ../../nixos/services
, system ? builtins.currentSystem
}:

4
tests/subversion.nix

@ -1,6 +1,6 @@
{ nixos ? ./..
, nixpkgs ? /etc/nixos/nixpkgs
, services ? /etc/nixos/services
, nixpkgs ? ../../nixpkgs
, services ? ../../services
, system ? builtins.currentSystem
}:

Loading…
Cancel
Save