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

Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16.

This commit is contained in:
Michael Raskin 2014-06-18 00:23:32 +02:00
parent fd4c2d893f
commit 8297a26746
2 changed files with 10 additions and 4 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

@ -238,7 +238,7 @@ with stdenv.lib;
SLIP_COMPRESSED y # CSLIP compressed headers SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n USB_DEBUG? n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y X86_CHECK_BIOS_CORRUPTION y

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

@ -1,12 +1,14 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.15-rc8"; # Reason to add: RTL8192EE
extraMeta.branch = "3.15"; version = "3.16-rc1";
modDirVersion = "3.16.0-rc1";
extraMeta.branch = "3.16";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
sha256 = ""; sha256 = "1y2ssifw6db40mr4j6k9c0kjwb4ssrrps74pc38krq4d6yzinhmq";
}; };
features.iwlwifi = true; features.iwlwifi = true;
@ -14,4 +16,8 @@ import ./generic.nix (args // rec {
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true; features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
# Should the testing kernels ever be built on Hydra?
extraMeta.hydraPlatforms = [];
} // (args.argsOverride or {})) } // (args.argsOverride or {}))