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

Merge pull request #55092 from samueldr/fix/revert-kernel-bump 

Reverts kernel bump + patch
This commit is contained in:
Samuel Dionne-Riel 2019-02-02 13:26:43 -05:00 committed by GitHub
parent 3b698b537c 048c36ccaa
commit a10b10dad2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,14 +58,11 @@ rec {
}; };
}; };
# Reverts a change related to the overlayfs overhaul in 4.19 raspberry_pi_wifi_fix = rec {
# https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626 name = "raspberry-pi-wifi-fix";
revert-vfs-dont-open-real = rec {
name = "revert-vfs-dont-open-real";
patch = fetchpatch { patch = fetchpatch {
name = name + ".patch"; url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch;
url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch; sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za";
sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
}; };
}; };
} }

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

@ -14556,7 +14556,6 @@ in
kernelPatches = kernelPatches =
[ 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
]; ];
}; };
@ -14564,7 +14563,7 @@ in
kernelPatches = kernelPatches =
[ 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.raspberry_pi_wifi_fix
]; ];
}; };
@ -14743,7 +14742,7 @@ in
}); });
# The current default kernel / kernel modules. # The current default kernel / kernel modules.
linuxPackages = linuxPackages_4_19; linuxPackages = linuxPackages_4_14;
linux = linuxPackages.kernel; linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!