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

linux-testing: Update to 4.3.0-rc2

Browse Source
This commit is contained in:
William A. Kennington III 2015-09-21 12:42:00 -07:00
parent 7040350f34
commit 9fbbbd5b68
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,9 @@ with stdenv.lib;
# Video configuration.
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
${optionalString (versionOlder version "4.3") ''
DRM_I915_KMS y
''}
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE y
${optionalString (versionOlder version "3.9") ''
@ -327,6 +329,7 @@ with stdenv.lib;
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
HWMON y
THERMAL_HWMON y # Hardware monitoring support
${optionalString (versionAtLeast version "3.15") ''
UEVENT_HELPER n

8
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.2-rc5";
modDirVersion = "4.2.0-rc5";
extraMeta.branch = "4.2";
version = "4.3-rc2";
modDirVersion = "4.3.0-rc2";
extraMeta.branch = "4.3";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0";
sha256 = "1mgm3r0vz0jbfbqxcjfw0wv5ix6qhwymjz1chh543lvb0729ayb4";
};
features.iwlwifi = true;

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

@ -1,4 +1,4 @@
{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile, ubootChooser }:
{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }:
let
readConfig = configfile: import (runCommand "config.nix" {} ''
@ -221,7 +221,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools ] ++ optional (stdenv.platform.uboot != null)
nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
makeFlags = commonMakeFlags ++ [