Author: raskin
Date: Fri Dec 23 18:48:12 2011
New Revision: 31056
URL: https://nixos.org/websvn/nix/?rev=31056&sc=1
Log:
Trying Linux-3.2-pre-git
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 Fri Dec 23 14:19:45
2011 (r31055)
+++ configurations/trunk/misc/raskin/package-groups.nix Fri Dec 23 18:48:12
2011 (r31056)
@@ -50,7 +50,7 @@
ipmitool ipmiutil freeipmi
] ++ baseKernel.extraModulePackages;
- toys = [ construo rogue fsg
+ toys = [ construo rogue fsg beret
lincity chipmunk xmoto sgtpuzzles
xboard xaos nethack zangband neverball
/*(xsokoban.passthru.function (x: {
@@ -101,7 +101,7 @@
mozplugger
(wrapFirefox { browser = firefox80Pkgs.firefox; nameSuffix="8"; })
- (wrapFirefox { browser = firefox90bPkgs.firefox; nameSuffix=""; })
+ (wrapFirefox { browser = firefox90Pkgs.firefox; nameSuffix=""; })
];
graphicEdit = [
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Dec 23
14:19:45 2011 (r31055)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Dec 23
18:48:12 2011 (r31056)
@@ -39,8 +39,15 @@
};
myKDE = pkgs.kde47;
kernelToUse = rec {
- kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_1 kernelPackages;
- extraModulePackages = [kernelPackages.acpi_call kernelPackages.aufs ];
+ kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_3_2.override {
+ src = /home/repos/linux-next-3.2-2011-12-23.tar.gz;
+ extraConfig = ''
+ BT_L2CAP? y
+ BT_SCO? y
+ '';
+ })
+ kernelPackages;
+ extraModulePackages = [/*kernelPackages.acpi_call kernelPackages.aufs */];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive myKDE;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
