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

linux 3.11 

works fine for me, but nvidia binary driver fails once again
This commit is contained in:
Mathijs Kwik 2013-09-04 06:49:22 +02:00
parent 8500581ac8
commit 03c9a1fb33
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -103,7 +103,9 @@ with stdenv.lib;
FB_SIS_300 y FB_SIS_300 y
FB_SIS_315 y FB_SIS_315 y
FB_3DFX_ACCEL y FB_3DFX_ACCEL y
${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") ''
FB_GEODE y FB_GEODE y
''}
# Video configuration. # Video configuration.
# Enable KMS for devices whose X.org driver supports it. # Enable KMS for devices whose X.org driver supports it.

17
pkgs/os-specific/linux/kernel/linux-3.11.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.11";
modDirVersion = "3.11.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1yfpa4fzhsn4r5dwkcf3azy0vqdms865jaikn3fdwbabmpqchgl0";
};
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

15
pkgs/top-level/all-packages.nix
View File

@ -6492,6 +6492,18 @@ let
]; ];
}; };
linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
/* Linux kernel modules are inherently tied to a specific kernel. So /* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages specific kernel, we have a function that builds those packages
@ -6613,8 +6625,9 @@ let
linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
# Update this when adding a new version! # Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_10; linuxPackages_latest = pkgs.linuxPackages_3_11;
# The current default kernel / kernel modules. # The current default kernel / kernel modules.
linux = linuxPackages.kernel; linux = linuxPackages.kernel;