Author: eelco
Date: Tue Jun 21 11:46:44 2011
New Revision: 27511
URL: https://svn.nixos.org/websvn/nix/?rev=27511&sc=1

Log:
* Config for ike.

Added:
   configurations/trunk/tud/ike.nix
      - copied, changed from r27402, 
configurations/trunk/tud/build-machines-dell-1950.nix
Modified:
   configurations/trunk/tud/common.nix

Modified: configurations/trunk/tud/common.nix
==============================================================================
--- configurations/trunk/tud/common.nix Tue Jun 21 10:46:21 2011        (r27510)
+++ configurations/trunk/tud/common.nix Tue Jun 21 11:46:44 2011        (r27511)
@@ -6,7 +6,7 @@
   boot.initrd.kernelModules = [ "ext4" ];
 
   environment.systemPackages = 
-    [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm 
pkgs.lsiutil 
+    [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm
       pkgs.htop pkgs.sqlite pkgs.iotop
     ];
 

Copied and modified: configurations/trunk/tud/ike.nix (from r27402, 
configurations/trunk/tud/build-machines-dell-1950.nix)
==============================================================================
--- configurations/trunk/tud/build-machines-dell-1950.nix       Thu Jun  9 
08:23:58 2011        (r27402, copy source)
+++ configurations/trunk/tud/ike.nix    Tue Jun 21 11:46:44 2011        (r27511)
@@ -1,14 +1,12 @@
-# Configuration for the Dell PowerEdge 1950 build machines.
-
 { config, pkgs, ... }:
 
 {
+  boot.loader.grub.version = 2;
   require = [ ./build-machines-common.nix ];
-
   nixpkgs.system = "x86_64-linux";
 
-  boot.initrd.kernelModules = [ "mptsas" "ext4" ];
-  boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
+  boot.initrd.kernelModules = [ "megaraid_sas" "ext4" ];
+  boot.kernelModules = [ "acpi-cpufreq" "kvm-amd" ];
 
   nix.maxJobs = 8;
 }
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to