From 393cc8e8b9cdcbf96b0bdbdbd0d5971bdf45fe75 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 19 May 2009 23:14:45 +0000
Subject: [PATCH] Substitute the "require" of imported modules by module paths.

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


svn path=/nixos/trunk/; revision=15660
---
 system/options.nix           | 20 ++++++++++----------
 upstart-jobs/cron.nix        | 10 +++++-----
 upstart-jobs/cron/locate.nix |  2 +-
 upstart-jobs/dhclient.nix    |  2 +-
 upstart-jobs/fcron.nix       | 10 +++++-----
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9b038fac9038..9fa68009fa5a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3126,19 +3126,19 @@ root        ALL=(ALL) SETENV: ALL
   
   require = [
     # newtworking
-    (import ../upstart-jobs/dhclient.nix)
+    ../upstart-jobs/dhclient.nix
 
     # hardware
-    (import ../upstart-jobs/pcmcia.nix)
+    ../upstart-jobs/pcmcia.nix
 
     # services
-    (import ../upstart-jobs/cron.nix)
-    (import ../upstart-jobs/fcron.nix)
-    (import ../upstart-jobs/cron/locate.nix)
-    (import ../upstart-jobs/manual.nix)
-    (import ../upstart-jobs/rogue.nix)
-    (import ../upstart-jobs/guest-users.nix)
-    (import ../upstart-jobs/pulseaudio.nix)
-    (import ../upstart-jobs/portmap.nix)
+    ../upstart-jobs/cron.nix
+    ../upstart-jobs/fcron.nix
+    ../upstart-jobs/cron/locate.nix
+    ../upstart-jobs/manual.nix
+    ../upstart-jobs/rogue.nix
+    ../upstart-jobs/guest-users.nix
+    ../upstart-jobs/pulseaudio.nix
+    ../upstart-jobs/portmap.nix
   ];
 }
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 078cf4766fcb..35c4b488bd7f 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -53,11 +53,11 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    # ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];
 
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index eace9f5129b8..bbb41f6e9432 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -45,7 +45,7 @@ in
 
 {
   require = [
-    (import ../../upstart-jobs/cron.nix) # config.services.cron
+    ../../upstart-jobs/cron.nix # config.services.cron
     options
   ];
 
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 5b732f42fd1b..342ac57e9b2a 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -55,7 +55,7 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix)
+    # ../upstart-jobs/default.nix
     options
   ];
 
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 5dd61e669d3b..b05b9d8ab6a3 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -79,11 +79,11 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    # ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];