strip trailing whitespace; no functional change

svn path=/nixos/trunk/; revision=29285

11 files changed, 97 insertions, 97 deletions

diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index ea7a1437928..37ba3bf309c 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -17,9 +17,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.autofs = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -97,7 +97,7 @@ in
           pkgs.lib.concatMapStrings (module : "modprobe ${module} || true\n")
                                     (["autofs4"] ++ cfg.kernelModules);
 
-        preStop = 
+        preStop =
           ''
             set -e; while :; do pkill -TERM automount; sleep 1; done
           '';
@@ -125,7 +125,7 @@ in
             exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
           '';
       };
-          
+
   };
-  
+
 }
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index d0ef5d34a64..1cb538f6a61 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.disnix;
-  
+
   disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: {
     enableApacheWebApplication = config.services.httpd.enable;
     enableAxis2WebService = config.services.tomcat.axis2.enable;
@@ -21,47 +21,47 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.disnix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable Disnix";
       };
-      
+
       useWebServiceInterface = mkOption {
         default = false;
 	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
-      
+
       publishInfrastructure = {
         enable = mkOption {
           default = false;
 	  description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
 	};
-	
+
 	enableAuthentication = mkOption {
 	  default = false;
 	  description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
 	};
-      };            
-      
+      };
+
       infrastructure = mkOption {
         default = {};
 	description = "List of name value pairs containing properties for the infrastructure model";
       };
-      
+
       publishAvahi = mkOption {
         default = false;
 	description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -84,7 +84,7 @@ in
       { name = "disnix";
         gid = config.ids.gids.disnix;
       };
-    
+
     services.disnix.infrastructure =
       optionalAttrs (cfg.publishInfrastructure.enable)
       ( { hostname = config.networking.hostName;
@@ -97,12 +97,12 @@ in
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
 	// optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
 	// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
-          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) 
+          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; })
 	)
     ;
-    
+
     services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
-    
+
     jobs = {
       disnix =
         { description = "Disnix server";
@@ -124,9 +124,9 @@ in
     } // optionalAttrs cfg.publishAvahi {
       disnixAvahi =
         { description = "Disnix Avahi publisher";
-      
+
           startOn = "started avahi-daemon";
-	
+
 	  exec =
           ''
             ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
diff --git a/modules/services/misc/felix.nix b/modules/services/misc/felix.nix
index f05abc38f08..2da50fc8595 100644
--- a/modules/services/misc/felix.nix
+++ b/modules/services/misc/felix.nix
@@ -12,16 +12,16 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.felix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the Apache Felix OSGi service";
       };
-      
+
       bundles = mkOption {
         default = [ pkgs.felix_remoteshell ];
         description = "List of bundles that should be activated on startup";
@@ -30,17 +30,17 @@ in
       user = mkOption {
         default = "osgi";
         description = "User account under which Apache Felix runs.";
-      };      
+      };
 
       group = mkOption {
         default = "osgi";
         description = "Group account under which Apache Felix runs.";
-      };      
-      
+      };
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -49,7 +49,7 @@ in
       { name = "osgi";
         gid = config.ids.gids.osgi;
       };
-      
+
     users.extraUsers = singleton
       { name = "osgi";
         uid = config.ids.uids.osgi;
@@ -60,16 +60,16 @@ in
     jobs.felix =
       { description = "Felix server";
 
-        preStart = 
+        preStart =
 	  ''
 	    # Initialise felix instance on first startup
 	    if [ ! -d /var/felix ]
 	    then
 	        # Symlink system files
-		
+
 	        mkdir -p /var/felix
 		chown ${cfg.user}:${cfg.group} /var/felix
-		
+
 		for i in ${pkgs.felix}/*
 		do
 		    if [ "$i" != "${pkgs.felix}/bundle" ]
@@ -77,11 +77,11 @@ in
 		        ln -sfn $i /var/felix/$(basename $i)
 		    fi
 		done
-		
+
 		# Symlink bundles
 		mkdir -p /var/felix/bundle
 		chown ${cfg.user}:${cfg.group} /var/felix/bundle
-		
+
 		for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
 		do
 		    if [ -f $i ]
@@ -97,7 +97,7 @@ in
 		done
 	    fi
 	  '';
-	  
+
         script =
           ''
 	    cd /var/felix
diff --git a/modules/services/misc/folding-at-home.nix b/modules/services/misc/folding-at-home.nix
index 06223bc56e0..9f4c4645279 100644
--- a/modules/services/misc/folding-at-home.nix
+++ b/modules/services/misc/folding-at-home.nix
@@ -7,9 +7,9 @@ let
 in {
 
   ###### interface
-  
+
   options = {
-  
+
     services.foldingAtHome = {
 
       enable = mkOption {
@@ -29,7 +29,7 @@ in {
       config = mkOption {
         default = "";
         description = ''
-          Extra configuration. Contents will be added verbatim to the 
+          Extra configuration. Contents will be added verbatim to the
           configuration file.
         '';
       };
@@ -71,4 +71,4 @@ in {
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 0d12bbc29f3..bc1d1f4575a 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -7,7 +7,7 @@ let
   uid = config.ids.uids.gpsd;
   gid = config.ids.gids.gpsd;
   cfg = config.services.gpsd;
-  
+
 in
 
 {
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.gpsd = {
 
       enable = mkOption {
@@ -70,9 +70,9 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf cfg.enable {
-  
+
     users.extraUsers = singleton
       { name = "gpsd";
         inherit uid;
@@ -100,5 +100,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 11a7aa19f23..221ad6e1f54 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   inherit (config.environment) nix;
-  
+
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
       description = "Nix build user ${toString nr}";
@@ -34,7 +34,7 @@ in
         This option specifies the Nix package instance to use throughout the system.
       ";
     };
-    
+
     nix = {
 
       maxJobs = mkOption {
@@ -76,10 +76,10 @@ in
           gc-keep-derivations = true
         ";
         description = "
-          This option allows to append lines to nix.conf. 
+          This option allows to append lines to nix.conf.
         ";
       };
-      
+
       distributedBuilds = mkOption {
         default = false;
         description = "
@@ -97,8 +97,8 @@ in
       manualNixMachines = mkOption {
         default = false;
         description = "
-          Whether to manually manage the list of buildmachines used in distributed 
-          builds in /etc/nix.machines. 
+          Whether to manually manage the list of buildmachines used in distributed
+          builds in /etc/nix.machines.
         ";
       };
 
@@ -113,7 +113,7 @@ in
       daemonIONiceLevel = mkOption {
         default = 7;
         description = "
-          Nix daemon process I/O priority. This priority propagates to build processes.        
+          Nix daemon process I/O priority. This priority propagates to build processes.
           0 is the default Unix process I/O priority, 7 is the lowest.
         ";
       };
@@ -155,11 +155,11 @@ in
           on the remote machine.
         ";
       };
-   
+
       proxy = mkOption {
         default = "";
         description = "
-          This option specifies the proxy to use for fetchurl. The real effect 
+          This option specifies the proxy to use for fetchurl. The real effect
           is just exporting http_proxy, https_proxy and ftp_proxy with that
           value.
         ";
@@ -208,13 +208,13 @@ in
               # in `build-chroot-dirs' - otherwise any builder that uses
               # /bin/sh won't work.
               binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
-  
+
               # Likewise, if chroots are turned on, we need Nix's own
               # closure in the chroot.  Otherwise nix-channel and nix-env
               # won't work because the dependencies of its builders (like
               # coreutils and Perl) aren't visible.  Sigh.
               nixDeps = pkgs.writeReferencesToFile config.environment.nix;
-            in 
+            in
               pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
                 extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
                 cat > $out <<END
@@ -236,7 +236,7 @@ in
           source = pkgs.writeText "nix.machines"
             (concatStrings (map (machine:
               "${machine.sshUser}@${machine.hostName} "
-              + (if machine ? system then machine.system else concatStringsSep "," machine.systems) 
+              + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
               + " ${machine.sshKey} ${toString machine.maxJobs} "
               + (if machine ? speedFactor then toString machine.speedFactor else "1" )
               + "\n"
@@ -259,7 +259,7 @@ in
               ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
           '';
 
-        extraConfig = 
+        extraConfig =
           ''
             limit nofile 4096 4096
           '';
@@ -269,7 +269,7 @@ in
       ''
         # Set up the environment variables for running Nix.
         ${config.nix.envVars}
-      
+
         # Set up secure multi-user builds: non-root users build through the
         # Nix daemon.
         if test "$USER" != root; then
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index f463a91998e..7853baf3afa 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -15,7 +15,7 @@ let
     inherit (cfg) revision;
     inherit pkgs options;
   };
-    
+
 in
 
 {
@@ -73,7 +73,7 @@ in
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
     jobs = mkIf cfg.showManual
-      { nixosManual = 
+      { nixosManual =
         { name = "nixos-manual";
 
           description = "NixOS manual";
@@ -88,7 +88,7 @@ in
         };
       };
 
-    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual 
+    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual
       [ { tty = "tty${cfg.ttyNumber}";
           theme = pkgs.themes "green";
         }
@@ -96,7 +96,7 @@ in
 
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
-      
+
   };
 
 }
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 8760ce12510..c313de956fc 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -10,12 +10,12 @@ let
   cfg = config.services.rogue;
 
 in
-  
+
 {
   ###### interface
 
   options = {
-  
+
     services.rogue.enable = mkOption {
       default = false;
       description = ''
@@ -33,13 +33,13 @@ in
 
   };
 
-  
+
   ###### implementation
 
   config = mkIf cfg.enable {
 
     boot.extraTTYs = [ cfg.tty ];
-  
+
     jobs.rogue =
       { description = "Rogue dungeon crawling game";
 
@@ -56,5 +56,5 @@ in
       };
 
   };
-    
+
 }
diff --git a/modules/services/misc/svnserve.nix b/modules/services/misc/svnserve.nix
index c1acf5723d8..b0806d14738 100644
--- a/modules/services/misc/svnserve.nix
+++ b/modules/services/misc/svnserve.nix
@@ -6,30 +6,30 @@ with pkgs.lib;
 let
 
   cfg = config.services.svnserve;
-  
+
 in
 
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.svnserve = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
       };
-      
+
       svnBaseDir = mkOption {
         default = "/repos";
 	description = "Base directory from which Subversion repositories are accessed.";
       };
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -37,9 +37,9 @@ in
     jobs.svnserve = {
       startOn = "started network-interfaces";
       stopOn = "stopping network-interfaces";
-      
+
       preStart = "mkdir -p ${cfg.svnBaseDir}";
-      
+
       exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
     };
   };
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 5d21e281b75..667d0c6de97 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.synergy = {
 
       # !!! All these option descriptions needs to be cleaned up.
@@ -27,13 +27,13 @@ in
         };
         screenName = mkOption {
           default = "";
-          description = " 
+          description = "
             use screen-name instead the hostname to identify
             ourselfs to the server.
             ";
         };
         serverAddress = mkOption {
-          description = " 
+          description = "
             The server address is of the form: [hostname][:port].  The
             hostname must be the address or hostname of the server.  The
             port overrides the default port, 24800.
@@ -56,7 +56,7 @@ in
         };
         screenName = mkOption {
           default = "";
-          description = " 
+          description = "
             use screen-name instead the hostname to identify
             this screen in the configuration.
             ";
@@ -76,9 +76,9 @@ in
   config = {
 
     jobs =
-    
+
       optionalAttrs cfgC.enable
-        { synergyClient = 
+        { synergyClient =
           { name = "synergy-client";
 
             description = "Synergy client";
@@ -92,9 +92,9 @@ in
             '';
           };
         }
-        
+
       // optionalAttrs cfgS.enable
-        { synergyServer = 
+        { synergyServer =
           { name = "synergy-server";
 
             description = "Synergy server";
@@ -122,7 +122,7 @@ section: screens
   win:
 end
 section: aliases
-    laptop: 
+    laptop:
       192.168.5.5
     dm:
       192.168.5.78
diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix
index 00b81b2f383..e1384323453 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/services/misc/virtualbox.nix
@@ -12,20 +12,20 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.virtualbox = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the VirtualBox service and other guest additions.";
-      };        
+      };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -34,10 +34,10 @@ in
     environment.systemPackages = [ ];
 
     boot.extraModulePackages = [ pkgs.linuxPackages.virtualboxGuestAdditions ];
-    
+
     jobs.virtualbox =
       { description = "VirtualBox service";
-      
+
         startOn = "started udev";
 
         exec = "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService";