diff options
| author | Ludovic Stordeur <Ludovic.Stordeur@inria.fr> | 2011-07-11 13:59:40 +0000 |
|---|---|---|
| committer | Ludovic Stordeur <Ludovic.Stordeur@inria.fr> | 2011-07-11 13:59:40 +0000 |
| commit | df0a6394b31fac21f29ce6230d012f592e1ef33a (patch) | |
| tree | 55c2df0caea92f7801d6f8c8bea7838ec3093f75 /pkgs/os-specific/linux/kernel/patches.nix | |
| parent | 8268a39690b036f9687ced0db23e9760505ec8c6 (diff) | |
| download | nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar.gz nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar.bz2 nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar.lz nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar.xz nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.tar.zst nixpkgs-df0a6394b31fac21f29ce6230d012f592e1ef33a.zip | |
Suffixed cifs timeout patch with kernel version.
Currently suffixed with 2.6.32. This pre-patch prepares the landing of several versions of this patch to support other Linux kernel versions. svn path=/nixpkgs/trunk/; revision=27709
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 47154600aa0..92e07f3cdef 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -38,7 +38,7 @@ let in -{ +rec { sec_perm_2_6_24 = { name = "sec_perm-2.6.24"; @@ -55,7 +55,7 @@ in extraConfig = fbcondecorConfig; features.fbConDecor = true; }; - + fbcondecor_2_6_27 = { name = "fbcondecor-0.9.4-2.6.27"; patch = fetchurl { @@ -75,7 +75,7 @@ in extraConfig = fbcondecorConfig; features.fbConDecor = true; }; - + fbcondecor_2_6_29 = { name = "fbcondecor-0.9.6-2.6.29.2"; patch = fetchurl { @@ -85,7 +85,7 @@ in extraConfig = fbcondecorConfig; features.fbConDecor = true; }; - + fbcondecor_2_6_31 = { name = "fbcondecor-0.9.6-2.6.31.2"; patch = fetchurl { @@ -148,7 +148,7 @@ in }; }; - gcov_2_6_28 = + gcov_2_6_28 = { name = "gcov"; patch = fetchurl { url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch; @@ -235,12 +235,14 @@ in # 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 = + cifs_timeout_2_6_32 = { name = "cifs-timeout"; - patch = ./cifs-timeout.patch; + patch = ./cifs-timeout-2.6.32.patch; features.cifsTimeout = true; }; + cifs_timeout = cifs_timeout_2_6_32; + no_xsave = { name = "no-xsave"; patch = fetchurl { |