Author: raskin
Date: Thu Nov 11 23:02:26 2010
New Revision: 24676
URL: https://svn.nixos.org/websvn/nix/?rev=24676&sc=1
Log:
some modules
Modified:
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Thu Nov 11 22:30:04
2010 (r24675)
+++ configurations/trunk/misc/raskin/package-groups.nix Thu Nov 11 23:02:26
2010 (r24676)
@@ -36,8 +36,8 @@
gpm setserial gnokii
- fbterm ddrescue
- ];
+ fbterm ddrescue baseKernel.kernelPackages.kernel
+ ] ++ baseKernel.extraModulePackages;
toys = [ construo rogue fsg
lincity chipmunk xmoto sgtpuzzles
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Thu Nov 11
22:30:04 2010 (r24675)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Thu Nov 11
23:02:26 2010 (r24676)
@@ -39,6 +39,7 @@
};
kernelToUse = rec {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_36 kernelPackages;
+ extraModulePackages = [kernelPackages.acpi_call];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive;
@@ -60,7 +61,8 @@
version = 2;
};
vesa = false;
- kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_36 kernelPackages;
+ kernelPackages = kernelToUse.kernelPackages;
+ extraModulePackages = kernelToUse.extraModulePackages;
initrd = {
kernelModules = [
"libata" "sd_mod"
@@ -76,13 +78,14 @@
"fbcon" "i915"
"usb-storage" "tun"
"battery" "ac" "thermal" "fuse" "kqemu"
- "8139too" "p4_clockmod" "cp2101" "ath9k"
+ "8139too" "cp2101" "ath9k"
"ati_agp"
"ahci" "loop" "ftdi_sio" "snd_pcm" "snd_hda_intel" "radeon"
"ipip" "ipv6" "video"
"fbdev"
"pata_atiixp" "sr_mod" "ahci" "pktcdvd" "ide-cd-mod"
- "atl1c"
+ "atl1c" "acpi_call" "acpi-cpufreq" "kvm-intel"
+ "cpufreq-ondemand" "configs"
];
hardwareScan = false;
resumeDevice = "8:8";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
