diff options
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0c498c5d828..b089e962397 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -238,7 +238,7 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n + USB_DEBUG? n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d58610a38cd..541384a8c11 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15-rc8"; - extraMeta.branch = "3.15"; + # Reason to add: RTL8192EE + version = "3.16-rc1"; + modDirVersion = "3.16.0-rc1"; + extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = ""; + sha256 = "1y2ssifw6db40mr4j6k9c0kjwb4ssrrps74pc38krq4d6yzinhmq"; }; features.iwlwifi = true; @@ -14,4 +16,8 @@ import ./generic.nix (args // rec { features.needsCifsUtils = true; features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; + + # Should the testing kernels ever be built on Hydra? + extraMeta.hydraPlatforms = []; + } // (args.argsOverride or {})) |