Author: eelco
Date: 2010-07-05 14:20:54 +0000 (Mon, 05 Jul 2010)
New Revision: 22478

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22478&view=rev

Modified:
   configurations/trunk/tud/common.nix
   configurations/trunk/tud/hydra.nix

Log:


Changes:

Modified: configurations/trunk/tud/common.nix
===================================================================
--- configurations/trunk/tud/common.nix 2010-07-05 12:47:35 UTC (rev 22477)
+++ configurations/trunk/tud/common.nix 2010-07-05 14:20:54 UTC (rev 22478)
@@ -3,7 +3,7 @@
 {
   boot.kernelModules = [ "coretemp" ];
 
-  environment.systemPackages = [ pkgs.emacs pkgs.subversion pkgs.sysstat 
pkgs.hdparm ];
+  environment.systemPackages = [ pkgs.emacs pkgs.subversion pkgs.sysstat 
pkgs.hdparm pkgs.lsiutil ];
 
   services.sshd.enable = true;
 

Modified: configurations/trunk/tud/hydra.nix
===================================================================
--- configurations/trunk/tud/hydra.nix  2010-07-05 12:47:35 UTC (rev 22477)
+++ configurations/trunk/tud/hydra.nix  2010-07-05 14:20:54 UTC (rev 22478)
@@ -29,9 +29,9 @@
   };
 
   fileSystems =
-    [ { mountPoint = "/"; 
+    [ { mountPoint = "/";
         label = "nixos";
-        options = "noatime,barrier=0";
+        options = "noatime,barrier=0,data=ordered";
       }
     ];
  
@@ -46,6 +46,7 @@
 
     extraOptions = ''
       gc-keep-outputs = true
+      gc-keep-derivations = true
 
       # The default (`true') slows Nix down a lot since the build farm
       # has so many GC roots.
@@ -85,7 +86,7 @@
           fi
         '';
     in
-    [ "15 02 * * * hydra source /home/hydrddda/.bashrc; 
/nix/var/nix/profiles/per-user/hydra/profile/bin/hydra_update_gc_roots.pl > 
/home/hydra/gc-roots.log 2>&1"
+    [ "15 02 * * * hydra source /home/hydra/.bashrc; 
/nix/var/nix/profiles/per-user/hydra/profile/bin/hydra_update_gc_roots.pl > 
/home/hydra/gc-roots.log 2>&1"
       # Make sure that at least 200 GiB of disk space is available.
       "15 03 * * * root  nix-store --gc --max-freed \"$((200 * 1024**3 - 1024 
* $(df /nix/store | tail -n 1 | awk '{ print $4 }')))\" > /var/log/gc.log 2>&1"
       "*/5 * * * * root  ${checkSpace}"

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to