Author: eelco
Date: Wed Apr 27 13:16:33 2011
New Revision: 26990
URL: https://svn.nixos.org/websvn/nix/?rev=26990&sc=1
Log:
* Remove most references to the "services" tree.
Modified:
nixos/trunk/lib/build-vms.nix
nixos/trunk/lib/eval-config.nix
nixos/trunk/lib/testing.nix
nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix
nixos/trunk/modules/module-list.nix
nixos/trunk/modules/services/networking/gw6c.nix
nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
nixos/trunk/release.nix
nixos/trunk/tests/default.nix
Modified: nixos/trunk/lib/build-vms.nix
==============================================================================
--- nixos/trunk/lib/build-vms.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/lib/build-vms.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -1,4 +1,4 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, system }:
let pkgs = import nixpkgs { config = {}; inherit system; }; in
@@ -22,7 +22,7 @@
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
Modified: nixos/trunk/lib/eval-config.nix
==============================================================================
--- nixos/trunk/lib/eval-config.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/lib/eval-config.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -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 @@
extraArgs = extraArgs_ // {
inherit pkgs modules baseModules;
modulesPath = ../modules;
- servicesPath = services;
pkgs_i686 = import nixpkgs { system = "i686-linux"; };
};
@@ -53,7 +51,7 @@
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 ];
Modified: nixos/trunk/lib/testing.nix
==============================================================================
--- nixos/trunk/lib/testing.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/lib/testing.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -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 {
Modified: nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix Wed Apr
27 13:01:42 2011 (r26989)
+++ nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix Wed Apr
27 13:16:33 2011 (r26990)
@@ -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
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/modules/module-list.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -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
Modified: nixos/trunk/modules/services/networking/gw6c.nix
==============================================================================
--- nixos/trunk/modules/services/networking/gw6c.nix Wed Apr 27 13:01:42
2011 (r26989)
+++ nixos/trunk/modules/services/networking/gw6c.nix Wed Apr 27 13:16:33
2011 (r26990)
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
with pkgs.lib;
@@ -7,7 +7,7 @@
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;
Modified: nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
==============================================================================
--- nixos/trunk/modules/services/web-servers/apache-httpd/default.nix Wed Apr
27 13:01:42 2011 (r26989)
+++ nixos/trunk/modules/services/web-servers/apache-httpd/default.nix Wed Apr
27 13:16:33 2011 (r26990)
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
with pkgs.lib;
@@ -72,7 +72,7 @@
phpOptions = "";
options = {};
};
- res = defaults // svcFunction {inherit config pkgs serverInfo
servicesPath;};
+ res = defaults // svcFunction { inherit config pkgs serverInfo; };
in res;
in map f defs;
Modified: nixos/trunk/release.nix
==============================================================================
--- nixos/trunk/release.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/release.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -151,10 +151,9 @@
} { system = "armv5tel-linux"; };
tests =
- { services ? ../services }:
let
t = import ./tests {
- inherit nixpkgs services;
+ inherit nixpkgs;
system = "i686-linux";
};
in {
Modified: nixos/trunk/tests/default.nix
==============================================================================
--- nixos/trunk/tests/default.nix Wed Apr 27 13:01:42 2011 (r26989)
+++ nixos/trunk/tests/default.nix Wed Apr 27 13:16:33 2011 (r26990)
@@ -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);
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
