mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Merge pull request #25792 from NeQuissimus/linux_4_12_rc1

Browse source 
linux-testing: 4.11-rc7 -> 4.12-rc1
This commit is contained in:
Tim Steinbach 2017-05-17 08:30:10 -04:00 committed by GitHub
parent 6960bc776a 336b044dcb
commit 8eb302d6d7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -214,7 +214,9 @@ with stdenv.lib;
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
${optionalString (versionOlder version "4.12") ''
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
''}
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
@ -495,7 +497,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.0") ''
KVM_COMPAT? y
''}
KVM_DEVICE_ASSIGNMENT? y
${optionalString (versionOlder version "4.12") ''
KVM_DEVICE_ASSIGNMENT? y
''}
${optionalString (versionAtLeast version "4.0") ''
KVM_GENERIC_DIRTYLOG_READ_PROTECT y
''}

10
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.11-rc7";
modDirVersion = "4.11.0-rc7";
extraMeta.branch = "4.11";
version = "4.12-rc1";
modDirVersion = "4.12.0-rc1";
extraMeta.branch = "4.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5";
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "13xyiqn7xv8ryqrfsx8b18qm1zj0qkfz92mdh611nqhhdlw7gcpk";
};
features.iwlwifi = true;