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

linux: 4.20.5 -> 4.20.6

Browse Source
This commit is contained in:
Tim Steinbach 2019-01-31 07:19:07 -05:00
parent e4c1ce97c3
commit 705207ec9b
No known key found for this signature in database
GPG Key ID: 6C654787275A64F1
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.20.5"; version = "4.20.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "057200c6wki2k29sp93gnmsq3pxjq5hs9pd2ncr66yll9abrd3gz"; sha256 = "09fzspfs1hhbqgb3fh54q1i5jmakmxb1y180m5dn1zqwsxayx1a1";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

8
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -68,12 +68,4 @@ rec {
sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq"; sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
}; };
}; };
raspberry_pi_wifi_fix = rec {
name = "raspberry-pi-wifi-fix";
patch = fetchpatch {
url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch;
sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za";
};
};
} }

1
pkgs/top-level/all-packages.nix
View File

@ -14555,7 +14555,6 @@ in
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.revert-vfs-dont-open-real kernelPatches.revert-vfs-dont-open-real
kernelPatches.raspberry_pi_wifi_fix
]; ];
}; };