* Remove most references to the "services" tree.

svn path=/nixos/trunk/; revision=26990

lib/build-vms.nix

@@ -1,4 +1,4 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, system }:
 
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
@@ -22,7 +22,7 @@ rec {
     nodes: configurations:
 
     import ./eval-config.nix {
-      inherit nixpkgs services system;
+      inherit nixpkgs system;
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs

lib/eval-config.nix

@@ -4,7 +4,6 @@
 
 { system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
-, services ? ../../services
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
@@ -32,7 +31,6 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    servicesPath = services;
     pkgs_i686 = import nixpkgs { system = "i686-linux"; };
   };
 
@@ -53,7 +51,7 @@ rec {
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
-          inherit system nixpkgs services extraArgs modules;
+          inherit system nixpkgs extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];

lib/testing.nix

@@ -1,6 +1,6 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, system }:
 
-with import ./build-vms.nix { inherit nixpkgs services system; };
+with import ./build-vms.nix { inherit nixpkgs system; };
 with pkgs;
 
 rec {