public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Substitute the "require" of imported modules by module paths.

Browse Source 
$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/branches/modular-nixos/; revision=15660
This commit is contained in:
Nicolas Pierron 2009-05-19 23:14:45 +00:00
parent 8ff00dd4c5
commit bb8fc2646e
30 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/boot-stage-2.nix
View File

@ -37,10 +37,10 @@ in
# config.boot.kernelPackages # config.boot.kernelPackages
# config.system.activationScripts # config.system.activationScripts
(import ../system/activate-configuration.nix) ../system/activate-configuration.nix
# config.system.build # config.system.build
(import ../system/system-options.nix) ../system/system-options.nix
]; ];
system = { system = {

4
etc/default.nix
View File

@ -253,10 +253,10 @@ in
option option
# config.system.build # config.system.build
(import ../system/system-options.nix) ../system/system-options.nix
# config.system.activationScripts # config.system.activationScripts
(import ../system/activate-configuration.nix) ../system/activate-configuration.nix
]; ];
system = { system = {

2
installer/grub.nix
View File

@ -100,7 +100,7 @@ in
options options
# config.system.build # config.system.build
(import ../system/system-options.nix) ../system/system-options.nix
]; ];
system = { system = {

168
system/options.nix
View File

@ -380,132 +380,132 @@ in
require = [ require = [
(import ../system/assertion.nix) ../system/assertion.nix
# boot (is it the right place ?) # boot (is it the right place ?)
(import ../system/kernel.nix) ../system/kernel.nix
(import ../boot/boot-stage-2.nix) ../boot/boot-stage-2.nix
(import ../installer/grub.nix) ../installer/grub.nix
# system # system
(import ../system/system-options.nix) ../system/system-options.nix
(import ../system/activate-configuration.nix) ../system/activate-configuration.nix
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
(import ../upstart-jobs/acpid.nix) # ACPI daemon ../upstart-jobs/acpid.nix # ACPI daemon
(import ../system/unix-odbc-drivers.nix) ../system/unix-odbc-drivers.nix
(import ../upstart-jobs/klogd.nix) ../upstart-jobs/klogd.nix
(import ../upstart-jobs/lvm.nix) # Makes LVM logical volumes available. ../upstart-jobs/lvm.nix # Makes LVM logical volumes available.
(import ../upstart-jobs/swraid.nix) # Activate software RAID arrays. ../upstart-jobs/swraid.nix # Activate software RAID arrays.
(import ../upstart-jobs/filesystems.nix) # Mount file systems. ../upstart-jobs/filesystems.nix # Mount file systems.
(import ../upstart-jobs/swap.nix) ../upstart-jobs/swap.nix
(import ../upstart-jobs/network-interfaces.nix) ../upstart-jobs/network-interfaces.nix
(import ../upstart-jobs/nscd.nix) # Name service cache daemon. ../upstart-jobs/nscd.nix # Name service cache daemon.
(import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell). ../upstart-jobs/maintenance-shell.nix # Handles the maintenance/stalled event (single-user shell).
(import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action. ../upstart-jobs/ctrl-alt-delete.nix # Ctrl-alt-delete action.
(import ../upstart-jobs/halt.nix) ../upstart-jobs/halt.nix
(import ../upstart-jobs/ifplugd.nix) # ifplugd daemon for monitoring Ethernet cables. ../upstart-jobs/ifplugd.nix # ifplugd daemon for monitoring Ethernet cables.
# security # security
(import ../system/sudo.nix) ../system/sudo.nix
# i18n # i18n
(import ../system/i18n.nix) ../system/i18n.nix
# environment # environment
(import ../etc/default.nix) ../etc/default.nix
(import ../system/nixos-environment.nix) ../system/nixos-environment.nix
# users # users
(import ../system/users-groups.nix) ../system/users-groups.nix
# newtworking # newtworking
(import ../upstart-jobs/dhclient.nix) ../upstart-jobs/dhclient.nix
# hardware # hardware
(import ../upstart-jobs/pcmcia.nix) ../upstart-jobs/pcmcia.nix
# security # security
(import ../system/nixos-security.nix) ../system/nixos-security.nix
# services # services
(import ../upstart-jobs/avahi-daemon.nix) ../upstart-jobs/avahi-daemon.nix
(import ../upstart-jobs/atd.nix) ../upstart-jobs/atd.nix
(import ../upstart-jobs/dbus.nix) ../upstart-jobs/dbus.nix
(import ../upstart-jobs/hal.nix) ../upstart-jobs/hal.nix
(import ../upstart-jobs/gpm.nix) ../upstart-jobs/gpm.nix
(import ../upstart-jobs/nagios/default.nix) ../upstart-jobs/nagios/default.nix
(import ../upstart-jobs/xserver/default.nix) ../upstart-jobs/xserver/default.nix
(import ../upstart-jobs/zabbix-agent.nix) ../upstart-jobs/zabbix-agent.nix
(import ../upstart-jobs/zabbix-server.nix) ../upstart-jobs/zabbix-server.nix
(import ../upstart-jobs/disnix.nix) ../upstart-jobs/disnix.nix
(import ../upstart-jobs/consolekit.nix) ../upstart-jobs/consolekit.nix
(import ../upstart-jobs/cron.nix) ../upstart-jobs/cron.nix
(import ../upstart-jobs/fcron.nix) ../upstart-jobs/fcron.nix
(import ../upstart-jobs/cron/locate.nix) ../upstart-jobs/cron/locate.nix
(import ../upstart-jobs/manual.nix) ../upstart-jobs/manual.nix
(import ../upstart-jobs/rogue.nix) ../upstart-jobs/rogue.nix
(import ../upstart-jobs/guest-users.nix) ../upstart-jobs/guest-users.nix
(import ../upstart-jobs/pulseaudio.nix) ../upstart-jobs/pulseaudio.nix
(import ../upstart-jobs/kbd.nix) ../upstart-jobs/kbd.nix
(import ../upstart-jobs/gw6c.nix) # Gateway6 ../upstart-jobs/gw6c.nix # Gateway6
(import ../upstart-jobs/syslogd.nix) ../upstart-jobs/syslogd.nix
(import ../upstart-jobs/dhcpd.nix) ../upstart-jobs/dhcpd.nix
(import ../upstart-jobs/sshd.nix) ../upstart-jobs/sshd.nix
(import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?) ../upstart-jobs/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
(import ../upstart-jobs/ntpd.nix) ../upstart-jobs/ntpd.nix
(import ../upstart-jobs/portmap.nix) ../upstart-jobs/portmap.nix
(import ../upstart-jobs/bitlbee.nix) ../upstart-jobs/bitlbee.nix
(import ../upstart-jobs/gnunet.nix) ../upstart-jobs/gnunet.nix
(import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux ../upstart-jobs/ejabberd.nix # untested, dosen't compile on x86_64-linux
(import ../upstart-jobs/jboss.nix) ../upstart-jobs/jboss.nix
(import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk ../upstart-jobs/tomcat.nix # untested, too lazy to get that jdk
(import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?) ../upstart-jobs/httpd.nix # Apache httpd (probably this can be removed ?)
(import ../upstart-jobs/apache-httpd) # Apache httpd (new style). ../upstart-jobs/apache-httpd # Apache httpd (new style).
(import ../upstart-jobs/vsftpd.nix) ../upstart-jobs/vsftpd.nix
(import ../upstart-jobs/cupsd.nix) # CUPS printing daemon ../upstart-jobs/cupsd.nix # CUPS printing daemon
(import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur. ../upstart-jobs/udev.nix # The udev daemon creates devices nodes and runs programs when hardware events occur.
(import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?) ../upstart-jobs/samba.nix # TODO: doesn't start here (?)
(import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test ../upstart-jobs/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
(import ../upstart-jobs/xfs.nix) ../upstart-jobs/xfs.nix
(import ../upstart-jobs/mysql.nix) ../upstart-jobs/mysql.nix
(import ../upstart-jobs/postgresql.nix) ../upstart-jobs/postgresql.nix
(import ../upstart-jobs/openfire.nix) ../upstart-jobs/openfire.nix
(import ../upstart-jobs/postfix.nix) ../upstart-jobs/postfix.nix
(import ../upstart-jobs/dovecot.nix) ../upstart-jobs/dovecot.nix
(import ../upstart-jobs/bind.nix) ../upstart-jobs/bind.nix
(import ../upstart-jobs/mingetty.nix) # The terminals on ttyX. ../upstart-jobs/mingetty.nix # The terminals on ttyX.
(import ../upstart-jobs/tty-backgrounds.nix) ../upstart-jobs/tty-backgrounds.nix
(import ../upstart-jobs/synergy.nix) ../upstart-jobs/synergy.nix
(import ../upstart-jobs/openvpn.nix) ../upstart-jobs/openvpn.nix
(import ../upstart-jobs/nfs-kernel.nix) ../upstart-jobs/nfs-kernel.nix
(import ../upstart-jobs/autofs.nix) ../upstart-jobs/autofs.nix
# nix # nix
(import ../upstart-jobs/nix.nix) # nix options and daemon ../upstart-jobs/nix.nix # nix options and daemon
(import ../system/nixos-installer.nix) ../system/nixos-installer.nix
#users #users
(import ../upstart-jobs/ldap) ../upstart-jobs/ldap
# fonts # fonts
(import ../system/fonts.nix) ../system/fonts.nix
# sound # sound
(import ../upstart-jobs/alsa.nix) ../upstart-jobs/alsa.nix
]; ];
} }

6
system/sudo.nix
View File

@ -52,10 +52,10 @@ mkIf cfg.enable {
options options
# config.environment.etc # config.environment.etc
(import ../etc/default.nix) ../etc/default.nix
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
# (import ?) # config.security.extraSetuidPrograms # ? # config.security.extraSetuidPrograms
]; ];
security = { security = {

2
system/system-options.nix
View File

@ -84,7 +84,7 @@ in
option option
# config.system.activationScripts # config.system.activationScripts
(import ../system/activate-configuration.nix) ../system/activate-configuration.nix
]; ];
system = { system = {

2
system/users-groups.nix
View File

@ -153,7 +153,7 @@ in
options options
# config.system.activationScripts # config.system.activationScripts
(import ../system/activate-configuration.nix) ../system/activate-configuration.nix
]; ];
system = { system = {

6
upstart-jobs/alsa.nix
View File

@ -72,9 +72,9 @@ in
mkIf config.sound.enable { mkIf config.sound.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# (import ../system/user.nix) # users.* # ../system/user.nix # users.*
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
options options
]; ];

10
upstart-jobs/atd.nix
View File

@ -95,16 +95,16 @@ mkIf cfg.enable {
options options
# config.services.extraJobs # config.services.extraJobs
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
# config.environment.etc # config.environment.etc
(import ../etc/default.nix) ../etc/default.nix
# users.* # users.*
(import ../system/users-groups.nix) ../system/users-groups.nix
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
# (import ?) # config.security.extraSetuidPrograms # ? # config.security.extraSetuidPrograms
]; ];
security = { security = {

14
upstart-jobs/avahi-daemon.nix
View File

@ -120,13 +120,13 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# (import ../system/?) # system.nssModules # ../system/? # system.nssModules
# (import ?) # config.environment.etc # ? # config.environment.etc
# (import ../system/user.nix) # users.* # ../system/user.nix # users.*
# (import ../upstart-jobs/udev.nix) # services.udev.* # ../upstart-jobs/udev.nix # services.udev.*
(import ../upstart-jobs/dbus.nix) # services.dbus.* ../upstart-jobs/dbus.nix # services.dbus.*
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
options options
]; ];

4
upstart-jobs/consolekit.nix
View File

@ -43,8 +43,8 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
(import ../upstart-jobs/dbus.nix) # services.dbus.* ../upstart-jobs/dbus.nix # services.dbus.*
options options
]; ];

10
upstart-jobs/cron.nix
View File

@ -54,11 +54,11 @@ in
{ {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# (import ?) # config.time.timeZone # ? # config.time.timeZone
# (import ?) # config.environment.etc # ? # config.environment.etc
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
# (import ?) # config.environment.cleanStart # ? # config.environment.cleanStart
options options
]; ];

2
upstart-jobs/cron/locate.nix
View File

@ -45,7 +45,7 @@ in
{ {
require = [ require = [
(import ../../upstart-jobs/cron.nix) # config.services.cron ../../upstart-jobs/cron.nix # config.services.cron
options options
]; ];

6
upstart-jobs/dbus.nix
View File

@ -96,9 +96,9 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# (import ../system/user.nix) # users.* # ../system/user.nix # users.*
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
options options
]; ];

2
upstart-jobs/default.nix
View File

@ -84,7 +84,7 @@ in
{ {
require = [ require = [
options options
(import ./lib/default.nix) ./lib/default.nix
]; ];
environment = { environment = {

2
upstart-jobs/dhclient.nix
View File

@ -55,7 +55,7 @@ in
{ {
require = [ require = [
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
options options
]; ];

4
upstart-jobs/disnix.nix
View File

@ -48,8 +48,8 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
(import ../upstart-jobs/dbus.nix) # services.dbus.* ../upstart-jobs/dbus.nix # services.dbus.*
options options
]; ];

10
upstart-jobs/fcron.nix
View File

@ -79,11 +79,11 @@ in
{ {
require = [ require = [
# (import ../upstart-jobs/default.nix) # config.services.extraJobs # ../upstart-jobs/default.nix # config.services.extraJobs
# (import ?) # config.time.timeZone # ? # config.time.timeZone
# (import ?) # config.environment.etc # ? # config.environment.etc
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
# (import ?) # config.environment.cleanStart # ? # config.environment.cleanStart
options options
]; ];

2
upstart-jobs/gpm.nix
View File

@ -47,7 +47,7 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# /etc/security/console.perms (should be generated ?) # /etc/security/console.perms (should be generated ?)
options options
]; ];

10
upstart-jobs/hal.nix
View File

@ -64,11 +64,11 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../upstart-jobs/default.nix) # config.services.extraJobs ../upstart-jobs/default.nix # config.services.extraJobs
# (import ../system/user.nix) # users.* # ../system/user.nix # users.*
# (import ../upstart-jobs/udev.nix) # services.udev.* # ../upstart-jobs/udev.nix # services.udev.*
(import ../upstart-jobs/dbus.nix) # services.dbus.* ../upstart-jobs/dbus.nix # services.dbus.*
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
options options
]; ];

10
upstart-jobs/nagios/default.nix
View File

@ -175,11 +175,11 @@ in
mkIf cfg.enable { mkIf cfg.enable {
require = [ require = [
(import ../../upstart-jobs/default.nix) # config.services.extraJobs ../../upstart-jobs/default.nix # config.services.extraJobs
# (import ../../system/user.nix) # users = { .. } # ../../system/user.nix # users = { .. }
# (import ?) # config.environment.etc # ? # config.environment.etc
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
# (import ../../upstart-jobs/httpd.nix) # config.services.httpd # ../../upstart-jobs/httpd.nix # config.services.httpd
options options
]; ];

4
upstart-jobs/pcmcia.nix
View File

@ -48,8 +48,8 @@ in
mkIf config.hardware.pcmcia.enable { mkIf config.hardware.pcmcia.enable {
require = [ require = [
# (import ../upstart-jobs/udev.nix) # ../upstart-jobs/udev.nix
# (import ?) # config.environment.extraPackages # ? # config.environment.extraPackages
options options
]; ];

12
upstart-jobs/xserver/default.nix
View File

@ -472,18 +472,18 @@ mkIf cfg.enable {
options options
# services.xserver.*Manager # services.xserver.*Manager
(import ./displayManager/default.nix) ./displayManager/default.nix
(import ./windowManager/default.nix) ./windowManager/default.nix
(import ./desktopManager/default.nix) ./desktopManager/default.nix
# services.extraJobs # services.extraJobs
(import ../../upstart-jobs/default.nix) ../../upstart-jobs/default.nix
# environment.etc # environment.etc
(import ../../etc/default.nix) ../../etc/default.nix
# fonts.fonts # fonts.fonts
(import ../../system/fonts.nix) ../../system/fonts.nix
# boot.extraModulePackages # boot.extraModulePackages
# security.extraSetuidPrograms # security.extraSetuidPrograms

10
upstart-jobs/xserver/desktopManager/default.nix
View File

@ -9,11 +9,11 @@ in
{ {
require = [ require = [
(import ./kde.nix) ./kde.nix
(import ./kde4.nix) ./kde4.nix
(import ./gnome.nix) ./gnome.nix
(import ./xterm.nix) ./xterm.nix
(import ./none.nix) ./none.nix
]; ];
services = { services = {

2
upstart-jobs/xserver/desktopManager/kde.nix
View File

@ -23,7 +23,7 @@ mkIf cfg.enable {
options options
# environment.kdePackages # environment.kdePackages
(import ./kdeEnvironment.nix) ./kdeEnvironment.nix
]; ];
services = { services = {

2
upstart-jobs/xserver/desktopManager/kde4.nix
View File

@ -23,7 +23,7 @@ mkIf cfg.enable {
options options
# environment.kdePackages # environment.kdePackages
(import ./kdeEnvironment.nix) ./kdeEnvironment.nix
]; ];
services = { services = {

4
upstart-jobs/xserver/displayManager/default.nix
View File

@ -87,8 +87,8 @@ in
{ {
# list of display managers. # list of display managers.
require = [ require = [
(import ./kdm.nix) ./kdm.nix
(import ./slim.nix) ./slim.nix
]; ];
services = { services = {

14
upstart-jobs/xserver/windowManager/default.nix
View File

@ -7,13 +7,13 @@ in
{ {
require = [ require = [
(import ./compiz.nix) ./compiz.nix
(import ./kwm.nix) ./kwm.nix
(import ./metacity.nix) ./metacity.nix
(import ./none.nix) ./none.nix
(import ./twm.nix) ./twm.nix
(import ./wmii.nix) ./wmii.nix
(import ./xmonad.nix) ./xmonad.nix
]; ];
services = { services = {

4
upstart-jobs/zabbix-agent.nix
View File

@ -93,8 +93,8 @@ in
{ {
require = [ require = [
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
# (import ../system/user.nix) # users = { .. } # ../system/user.nix # users = { .. }
options options
]; ];

4
upstart-jobs/zabbix-server.nix
View File

@ -86,8 +86,8 @@ in
{ {
require = [ require = [
(import ../upstart-jobs/default.nix) ../upstart-jobs/default.nix
# (import ../system/user.nix) # users = { .. } # ../system/user.nix # users = { .. }
options options
]; ];