From cfa218a26b8ce073cf93f1f5f98f1a123c985803 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 May 2009 09:09:17 +0000 Subject: [PATCH] * Move the list of modules into a separate file. This file could be generated by some find/grep hackery as Nicolas suggested. svn path=/nixos/branches/modular-nixos/; revision=15743 --- default.nix | 2 - modules/module-list.nix | 88 ++++++++++++++++++++++++++++++++++++++++ system/options.nix | 90 +---------------------------------------- 3 files changed, 89 insertions(+), 91 deletions(-) create mode 100644 modules/module-list.nix diff --git a/default.nix b/default.nix index de237520ba3a..45e43c18e6d1 100644 --- a/default.nix +++ b/default.nix @@ -10,8 +10,6 @@ let pkgs = import nixpkgs {system = builtins.currentSystem;}; - #system = import system/system.nix { inherit configuration nixpkgs; }; - configComponents = [ configuration (import ./system/options.nix) diff --git a/modules/module-list.nix b/modules/module-list.nix new file mode 100644 index 000000000000..57f8a014a2ae --- /dev/null +++ b/modules/module-list.nix @@ -0,0 +1,88 @@ +[ #./hardware/network/intel-3945abg.nix + ../etc/default.nix + ./config/fonts.nix + ./config/i18n.nix + ./config/system-path.nix + ./config/unix-odbc-drivers.nix + ./config/users-groups.nix + ./installer/grub/grub.nix + ./security/setuid-wrappers.nix + ./security/sudo.nix + ./services/audio/alsa.nix + ./services/audio/pulseaudio.nix + ./services/databases/mysql.nix + ./services/databases/postgresql.nix + ./services/hardware/acpid.nix + ./services/hardware/hal.nix + ./services/hardware/udev.nix + ./services/logging/klogd.nix + ./services/logging/syslogd.nix + ./services/mail/dovecot.nix + ./services/mail/postfix.nix + ./services/misc/autofs.nix + ./services/misc/disnix.nix + ./services/misc/nix-daemon.nix + ./services/misc/nixos-manual.nix + ./services/misc/rogue.nix + ./services/misc/synergy.nix + ./services/monitoring/nagios/default.nix + ./services/monitoring/zabbix-agent.nix + ./services/monitoring/zabbix-server.nix + ./services/network-filesystems/nfs-kernel.nix + ./services/network-filesystems/samba.nix # TODO: doesn't start here (?) + ./services/networking/avahi-daemon.nix + ./services/networking/bind.nix + ./services/networking/bitlbee.nix + ./services/networking/dhclient.nix + ./services/networking/dhcpd.nix + ./services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux + ./services/networking/gnunet.nix + ./services/networking/gw6c.nix + ./services/networking/ifplugd.nix + ./services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test + ./services/networking/ntpd.nix + ./services/networking/openfire.nix + ./services/networking/openvpn.nix + ./services/networking/portmap.nix + ./services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?) + ./services/networking/ssh/sshd.nix + ./services/networking/vsftpd.nix + ./services/printing/cupsd.nix + ./services/scheduling/atd.nix + ./services/scheduling/cron.nix + ./services/scheduling/fcron.nix + ./services/system/consolekit.nix + ./services/system/dbus.nix + ./services/system/nscd.nix + ./services/ttys/gpm.nix + ./services/ttys/mingetty.nix + ./services/web-servers/apache-httpd + ./services/web-servers/jboss.nix + ./services/web-servers/tomcat.nix # untested, too lazy to get that jdk + ./services/x11/xfs.nix + ./services/x11/xserver/default.nix + ./system/activation/activation-script.nix + ./system/activation/top-level.nix + ./system/boot/kernel.nix + ./system/boot/stage-1.nix + ./system/boot/stage-2.nix + ./system/upstart-events/ctrl-alt-delete.nix + ./system/upstart-events/halt.nix + ./system/upstart-events/maintenance-shell.nix + ../system/assertion.nix + ../system/nixos-environment.nix + ../system/nixos-installer.nix + ../system/system-options.nix + ../upstart-jobs/cron/locate.nix + ../upstart-jobs/default.nix + ../upstart-jobs/filesystems.nix + ../upstart-jobs/guest-users.nix + ../upstart-jobs/kbd.nix + ../upstart-jobs/ldap + ../upstart-jobs/lvm.nix + ../upstart-jobs/network-interfaces.nix + ../upstart-jobs/pcmcia.nix + ../upstart-jobs/swap.nix + ../upstart-jobs/swraid.nix + ../upstart-jobs/tty-backgrounds.nix +] diff --git a/system/options.nix b/system/options.nix index a15a4b30a4a5..b5120f651d73 100644 --- a/system/options.nix +++ b/system/options.nix @@ -380,93 +380,5 @@ in "; }; - require = [ - #../modules/hardware/network/intel-3945abg.nix - ../etc/default.nix - ../modules/config/fonts.nix - ../modules/config/i18n.nix - ../modules/config/system-path.nix - ../modules/config/unix-odbc-drivers.nix - ../modules/config/users-groups.nix - ../modules/installer/grub/grub.nix - ../modules/security/setuid-wrappers.nix - ../modules/security/sudo.nix - ../modules/services/audio/alsa.nix - ../modules/services/audio/pulseaudio.nix - ../modules/services/databases/mysql.nix - ../modules/services/databases/postgresql.nix - ../modules/services/hardware/acpid.nix - ../modules/services/hardware/hal.nix - ../modules/services/hardware/udev.nix - ../modules/services/logging/klogd.nix - ../modules/services/logging/syslogd.nix - ../modules/services/mail/dovecot.nix - ../modules/services/mail/postfix.nix - ../modules/services/misc/autofs.nix - ../modules/services/misc/disnix.nix - ../modules/services/misc/nix-daemon.nix - ../modules/services/misc/nixos-manual.nix - ../modules/services/misc/rogue.nix - ../modules/services/misc/synergy.nix - ../modules/services/monitoring/nagios/default.nix - ../modules/services/monitoring/zabbix-agent.nix - ../modules/services/monitoring/zabbix-server.nix - ../modules/services/network-filesystems/nfs-kernel.nix - ../modules/services/network-filesystems/samba.nix # TODO: doesn't start here (?) - ../modules/services/networking/avahi-daemon.nix - ../modules/services/networking/bind.nix - ../modules/services/networking/bitlbee.nix - ../modules/services/networking/dhclient.nix - ../modules/services/networking/dhcpd.nix - ../modules/services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux - ../modules/services/networking/gnunet.nix - ../modules/services/networking/gw6c.nix - ../modules/services/networking/ifplugd.nix - ../modules/services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test - ../modules/services/networking/ntpd.nix - ../modules/services/networking/openfire.nix - ../modules/services/networking/openvpn.nix - ../modules/services/networking/portmap.nix - ../modules/services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?) - ../modules/services/networking/ssh/sshd.nix - ../modules/services/networking/vsftpd.nix - ../modules/services/printing/cupsd.nix - ../modules/services/scheduling/atd.nix - ../modules/services/scheduling/cron.nix - ../modules/services/scheduling/fcron.nix - ../modules/services/system/consolekit.nix - ../modules/services/system/dbus.nix - ../modules/services/system/nscd.nix - ../modules/services/ttys/gpm.nix - ../modules/services/ttys/mingetty.nix - ../modules/services/web-servers/apache-httpd - ../modules/services/web-servers/jboss.nix - ../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk - ../modules/services/x11/xfs.nix - ../modules/services/x11/xserver/default.nix - ../modules/system/activation/activation-script.nix - ../modules/system/activation/top-level.nix - ../modules/system/boot/kernel.nix - ../modules/system/boot/stage-1.nix - ../modules/system/boot/stage-2.nix - ../modules/system/upstart-events/ctrl-alt-delete.nix - ../modules/system/upstart-events/halt.nix - ../modules/system/upstart-events/maintenance-shell.nix - ../system/assertion.nix - ../system/nixos-environment.nix - ../system/nixos-installer.nix - ../system/system-options.nix - ../upstart-jobs/cron/locate.nix - ../upstart-jobs/default.nix - ../upstart-jobs/filesystems.nix - ../upstart-jobs/guest-users.nix - ../upstart-jobs/kbd.nix - ../upstart-jobs/ldap - ../upstart-jobs/lvm.nix - ../upstart-jobs/network-interfaces.nix - ../upstart-jobs/pcmcia.nix - ../upstart-jobs/swap.nix - ../upstart-jobs/swraid.nix - ../upstart-jobs/tty-backgrounds.nix - ]; + require = import ../modules/module-list.nix; }