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

linux: 5.7-rc6 -> 5.8-rc1

Browse Source
This commit is contained in:
Tim Steinbach 2020-06-15 11:10:00 -04:00
parent 8a73cd8734
commit 5953625fa5
No known key found for this signature in database
GPG Key ID: 6538CB9266B06F31
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -206,8 +206,8 @@ let
B43_PHY_HT = option yes; B43_PHY_HT = option yes;
BCMA_HOST_PCI = option yes; BCMA_HOST_PCI = option yes;
RTW88 = whenAtLeast "5.2" module; RTW88 = whenAtLeast "5.2" module;
RTW88_8822BE = whenAtLeast "5.2" yes; RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ];
RTW88_8822CE = whenAtLeast "5.2" yes; RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ];
}; };
fb = { fb = {

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

@ -3,15 +3,15 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.7-rc6"; version = "5.8-rc1";
extraMeta.branch = "5.7"; extraMeta.branch = "5.1";
# modDirVersion needs to be x.y.z, will always add .0 # modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?