diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2016-11-27 19:47:34 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2016-11-27 19:48:24 -0500 |
| commit | eecf76eaa23f12109fc2be64a892fcabcf8ae642 (patch) | |
| tree | 957619222f5d38b000a13dc4fa3fc7a5c2956e1f /pkgs/os-specific | |
| parent | 86ea3126bc4543cc7880aab73dc1edaffe80537e (diff) | |
| download | nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar.gz nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar.bz2 nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar.lz nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar.xz nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.tar.zst nixlib-eecf76eaa23f12109fc2be64a892fcabcf8ae642.zip | |
linux: 4.9-rc6 -> 4.9-rc7
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ab5af38d8b67..2ae714ea089f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -367,7 +367,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") '' MLX4_EN_VXLAN y ''} - MODVERSIONS y + ${optionalString (versionOlder version "4.9") '' + MODVERSIONS y + ''} MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension MTRR_SANITIZER y NET_FC y # Fibre Channel driver support diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9979b854693b..95e89005b0fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc6"; - modDirVersion = "4.9.0-rc6"; + version = "4.9-rc7"; + modDirVersion = "4.9.0-rc7"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0pxf4gzg8qxlf0i83vybf8g22aj0jjbk6n63bh9nciqhbshilr1w"; + sha256 = "0da5bf5cizvbn68d8pb5kyli3zkgsc8g61kn1b4d8gwvfxrb75hx"; }; features.iwlwifi = true; |