public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source
This commit is contained in:
Peter Simons
2012-10-10 18:46:48 +02:00
parent 7dd1e71c2e c35a43315c
commit 6ff829f19d
25 changed files with 339 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.43";
version = "3.0.45";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29";
sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.11";
version = "3.4.13";
testing = false;
preConfigure = ''
@@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2";
sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.5.nix
View File

@@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
version = "3.5.4";
version = "3.5.6";
testing = false;
preConfigure = ''
@@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12";
sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf";
};
config = configWithPlatform stdenv.platform;

5
pkgs/os-specific/linux/kernel/linux-3.6.nix
View File

@@ -244,8 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6";
modDirVersion = "3.6.0";
version = "3.6.1";
testing = false;
preConfigure = ''
@@ -254,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
};
config = configWithPlatform stdenv.platform;

16
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -189,6 +189,21 @@ rec {
features.aufs3 = true;
};
# not officially released yet, but 3.x seems to work fine
aufs3_6 = rec {
name = "aufs3.6";
version = "3.x.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
@@ -226,6 +241,7 @@ rec {
patch = ./dell-rfkill.patch;
};
# seems no longer necessary on 3.6
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;