Author: shlevy
Date: Sun Jul 24 03:05:00 2011
New Revision: 27915
URL: https://svn.nixos.org/websvn/nix/?rev=27915&sc=1
Log:
First attempt at linuxPackages_3_0
Added:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
- copied, changed from r27913,
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.39.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
(from r27913, nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.39.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.39.nix Sat Jul
23 23:01:39 2011 (r27913, copy source)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Sun Jul 24
03:05:00 2011 (r27915)
@@ -149,7 +149,6 @@
BT_L2CAP y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
- CPU_FREQ_DEBUG n
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS y # we use udev
@@ -160,7 +159,6 @@
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
- KALLSYMS_EXTRA_PASS n
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
@@ -192,11 +190,11 @@
import ./generic.nix (
rec {
- version = "2.6.39.3";
+ version = "3.0";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "1lx8064xf13h79qcbdw74mz5x94pl662s9iyqgcyb6wjwfyxhjrj";
+ url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.bz2";
+ sha256 = "182n0glwxb6wdm87kxzl7n7fbk9pnykhjq88vyrb0fffaj5j5c34";
};
config = configWithPlatform stdenv.platform;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 24 01:39:11
2011 (r27914)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 24 03:05:00
2011 (r27915)
@@ -5336,6 +5336,16 @@
];
};
+ linux_3_0 = makeOverridable (import
../os-specific/linux/kernel/linux-3.0.nix) {
+ inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ kernelPatches =
+ [ #kernelPatches.fbcondecor_2_6_38
+ kernelPatches.sec_perm_2_6_24
+ #kernelPatches.aufs2_1_2_6_38
+ #kernelPatches.mips_restart_2_6_36
+ ];
+ };
+
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@@ -5466,6 +5476,7 @@
linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38
pkgs.linuxPackages_2_6_38);
linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor
linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39
pkgs.linuxPackages_2_6_39);
+ linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0
pkgs.linuxPackages_3_0);
linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor
linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
