Author: guibert
Date: Thu Aug 12 16:33:19 2010
New Revision: 23155
URL: https://svn.nixos.org/websvn/nix/?rev=23155&sc=1
Log:
kernel updates and add kernel 2.6.35.1
Added:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
- copied, changed from r23154,
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix Thu Aug
12 14:58:02 2010 (r23154)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix Thu Aug
12 16:33:19 2010 (r23155)
@@ -3,11 +3,11 @@
import ./generic.nix (
rec {
- version = "2.6.27.49";
+ version = "2.6.27.50";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "09gnh26gs4bkaj9ib3c5cnmbgj3bhbw7g6b49hz0xrp067slyxai";
+ sha256 = "09lrwrf2278wz5ic3hzjmqcahlazcpw7sxyvln09nmf42anaw7fc";
};
features.iwlwifi = true;
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.31.nix Thu Aug
12 14:58:02 2010 (r23154)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.31.nix Thu Aug
12 16:33:19 2010 (r23155)
@@ -4,16 +4,12 @@
import ./generic.nix (
- let
- baseVersion = "2.6.31";
- in
-
rec {
- version = "2.6.31";
+ version = "2.6.31.14";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/linux-${baseVersion}.tar.bz2";
- sha256 = "04im1rk53j1im1q8i6pl6qn75zd63dg51dxhq8cfxdsxp3vq7k8a";
+ url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+ sha256 = "1c6ivcjgns4gbx04mhnhndqikm3prqhhfm2a5zrb1mfyvvishqpp";
};
features = {
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix Thu Aug
12 14:58:02 2010 (r23154)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix Thu Aug
12 16:33:19 2010 (r23155)
@@ -194,11 +194,11 @@
import ./generic.nix (
rec {
- version = "2.6.34.2";
+ version = "2.6.34.3";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "1p1s35sffvsdfh5rd5jl8iyin0il690als0q75fszf0fx1bh63sr";
+ sha256 = "1mm5yphkclcmjbq7v40nn6js1canna1gl5d4065xiza0v5gdq83v";
};
config = configWithPlatform stdenv.platform;
Copied and modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix (from r23154,
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.34.nix Thu Aug
12 14:58:02 2010 (r23154, copy source)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.35.nix Thu Aug
12 16:33:19 2010 (r23155)
@@ -19,10 +19,6 @@
# Enable the kernel's built-in memory tester.
MEMTEST y
- # Include the CFQ I/O scheduler in the kernel, rather than as a
- # module, so that the initrd gets a good I/O scheduler.
- IOSCHED_CFQ y
-
# Disable some expensive (?) features.
FTRACE n
KPROBES n
@@ -194,11 +190,11 @@
import ./generic.nix (
rec {
- version = "2.6.34.2";
+ version = "2.6.35.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "1p1s35sffvsdfh5rd5jl8iyin0il690als0q75fszf0fx1bh63sr";
+ sha256 = "04pax26ksdp8i61qr4qdwc98iw47vjnwi53x73hbii5v0dz3qixy";
};
config = configWithPlatform stdenv.platform;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 14:58:02
2010 (r23154)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 16:33:19
2010 (r23155)
@@ -4523,6 +4523,14 @@
];
};
+ linux_2_6_35 = makeOverridable (import
../os-specific/linux/kernel/linux-2.6.35.nix) {
+ inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ kernelPatches =
+ [ /*kernelPatches.fbcondecor_2_6_33*/
+ kernelPatches.sec_perm_2_6_24
+ ];
+ };
+
/* 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
@@ -4624,6 +4632,7 @@
recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap
pkgs.linuxPackages_2_6_32_systemtap);
linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33
pkgs.linuxPackages_2_6_33);
linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34
pkgs.linuxPackages_2_6_34);
+ linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35
pkgs.linuxPackages_2_6_35);
# The current default kernel / kernel modules.
linux = linux_2_6_32;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
