From 650d14be8dfda0064b43f4b643759de2ebb64585 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Apr 2011 13:16:33 +0000 Subject: [PATCH] * Remove most references to the "services" tree. svn path=/nixos/trunk/; revision=26990 --- lib/build-vms.nix | 4 ++-- lib/eval-config.nix | 4 +--- lib/testing.nix | 4 ++-- modules/installer/tools/nixos-build-vms/build-vms.nix | 3 +-- modules/module-list.nix | 4 ++-- modules/services/networking/gw6c.nix | 4 ++-- modules/services/web-servers/apache-httpd/default.nix | 4 ++-- release.nix | 3 +-- tests/default.nix | 3 +-- 9 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/build-vms.nix b/lib/build-vms.nix index 8d4592b48bd..913d5276db2 100644 --- a/lib/build-vms.nix +++ b/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 diff --git a/lib/eval-config.nix b/lib/eval-config.nix index 7697f44a7e5..c646d52c802 100644 --- a/lib/eval-config.nix +++ b/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 ]; diff --git a/lib/testing.nix b/lib/testing.nix index 670a1dd6ac2..17f4e45c83b 100644 --- a/lib/testing.nix +++ b/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 { diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix index f83f68f9439..9ed574a4e24 100644 --- a/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -1,11 +1,10 @@ { nixpkgs -, services ? "/etc/nixos/services" , system ? builtins.currentSystem , networkExpr }: let nodes = import networkExpr; in -with import ../../../../lib/testing.nix { inherit nixpkgs services system; }; +with import ../../../../lib/testing.nix { inherit nixpkgs system; }; (complete { inherit nodes; testScript = ""; }).driver diff --git a/modules/module-list.nix b/modules/module-list.nix index 69f6133a7ed..f67dbb29384 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -103,7 +103,7 @@ ./services/networking/gvpe.nix ./services/networking/gw6c.nix ./services/networking/ifplugd.nix - ./services/networking/ircd-hybrid.nix + #./services/networking/ircd-hybrid.nix ./services/networking/nat.nix ./services/networking/ntpd.nix ./services/networking/openfire.nix @@ -135,7 +135,7 @@ ./services/ttys/gpm.nix ./services/ttys/mingetty.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/jboss.nix + #./services/web-servers/jboss.nix ./services/web-servers/tomcat.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix index eaf84c5f70f..fba9d440ad2 100644 --- a/modules/services/networking/gw6c.nix +++ b/modules/services/networking/gw6c.nix @@ -1,4 +1,4 @@ -{ config, pkgs, servicesPath, ... }: +{ config, pkgs, ... }: with pkgs.lib; @@ -7,7 +7,7 @@ let cfg = config.services.gw6c; # !!! Move this from the services tree to the nixos tree. - gw6cService = import (servicesPath + /gw6c) { + gw6cService = import /etc/nixos/services/gw6c { inherit (pkgs) stdenv gw6c coreutils procps iputils gnused gnugrep seccure writeScript; diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix index ddb8e4f90de..7b2f685c2b6 100644 --- a/modules/services/web-servers/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, servicesPath, ... }: +{ config, pkgs, ... }: with pkgs.lib; @@ -72,7 +72,7 @@ let phpOptions = ""; options = {}; }; - res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;}; + res = defaults // svcFunction { inherit config pkgs serverInfo; }; in res; in map f defs; diff --git a/release.nix b/release.nix index f89709c628d..7681cda16ec 100644 --- a/release.nix +++ b/release.nix @@ -151,10 +151,9 @@ let } { system = "armv5tel-linux"; }; tests = - { services ? ../services }: let t = import ./tests { - inherit nixpkgs services; + inherit nixpkgs; system = "i686-linux"; }; in { diff --git a/tests/default.nix b/tests/default.nix index 1e5d1a71848..7f34c4927a3 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,9 +1,8 @@ { nixpkgs ? ../../nixpkgs -, services ? ../../services , system ? builtins.currentSystem }: -with import ../lib/testing.nix { inherit nixpkgs services system; }; +with import ../lib/testing.nix { inherit nixpkgs system; }; { avahi = makeTest (import ./avahi.nix);