diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2020-06-15 11:10:00 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2020-06-15 11:10:17 -0400 |
| commit | 5953625fa5235f3b947cc4d884b138f0ca4c475b (patch) | |
| tree | b526f4c7d1da418a55c0e46cb6cfc56597ad02ca /pkgs | |
| parent | 8a73cd873409400ef01530523bf8d11fae82334c (diff) | |
| download | nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.gz nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.bz2 nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.lz nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.xz nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.tar.zst nixlib-5953625fa5235f3b947cc4d884b138f0ca4c475b.zip | |
linux: 5.7-rc6 -> 5.8-rc1
Diffstat (limited to 'pkgs')
| -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, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1cec678d1534..36fb39fd1308 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -206,8 +206,8 @@ let B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = whenAtLeast "5.2" yes; - RTW88_8822CE = whenAtLeast "5.2" yes; + RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f2f0fac3b7dd..2a7a1fa93425 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc6"; - extraMeta.branch = "5.7"; + version = "5.8-rc1"; + extraMeta.branch = "5.1"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; + sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc"; }; # Should the testing kernels ever be built on Hydra? |