Browse Source

* Remove most references to the "services" tree.

svn path=/nixos/trunk/; revision=26990
nsd-state-dir
Eelco Dolstra 12 years ago
parent
commit
650d14be8d
  1. 4
      lib/build-vms.nix
  2. 4
      lib/eval-config.nix
  3. 4
      lib/testing.nix
  4. 3
      modules/installer/tools/nixos-build-vms/build-vms.nix
  5. 4
      modules/module-list.nix
  6. 4
      modules/services/networking/gw6c.nix
  7. 4
      modules/services/web-servers/apache-httpd/default.nix
  8. 3
      release.nix
  9. 3
      tests/default.nix

4
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

4
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 ];

4
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 {

3
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

4
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

4
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;

4
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;

3
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 {

3
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);

Loading…
Cancel
Save