diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-07-15 19:30:44 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-07-15 19:30:44 -0400 |
| commit | b103e9317afdd80bf6a12b316a35c757f04da50e (patch) | |
| tree | a9a28f290630a13e61d0b7b7a1dc0fea4bd68480 /pkgs/os-specific | |
| parent | 81b993369c63b0d042814418f20bc71b44c7e84f (diff) | |
| download | nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar.gz nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar.bz2 nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar.lz nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar.xz nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.tar.zst nixlib-b103e9317afdd80bf6a12b316a35c757f04da50e.zip | |
linux-testing: 4.12-rc7 -> 4.13-rc1
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 | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 73dce131cf8b..9700373c852f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -302,7 +302,9 @@ with stdenv.lib; CIFS_UPCALL y CIFS_ACL y CIFS_DFS_UPCALL y - CIFS_SMB2 y + ${optionalString (versionOlder version "4.13") '' + CIFS_SMB2 y + ''} ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 60dfe85a1606..c7a4ca30a7c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12-rc7"; - modDirVersion = "4.12.0-rc7"; - extraMeta.branch = "4.12"; + version = "4.13-rc1"; + modDirVersion = "4.13.0-rc1"; + extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1svfswv0b4gagv1yiavwb22p726h0w81lgxjqq0h9m3gf4xlqp3x"; + sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m"; }; features.iwlwifi = true; |