diff options
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2ff0d5d2620..f09b9d6ea5b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,14 +58,11 @@ rec { }; }; - # Reverts a change related to the overlayfs overhaul in 4.19 - # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626 - revert-vfs-dont-open-real = rec { - name = "revert-vfs-dont-open-real"; + raspberry_pi_wifi_fix = rec { + name = "raspberry-pi-wifi-fix"; patch = fetchpatch { - name = name + ".patch"; - url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch; - sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq"; + 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"; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb901ff307..e6c96fabf90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14556,7 +14556,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real ]; }; @@ -14564,7 +14563,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real + kernelPatches.raspberry_pi_wifi_fix ]; }; |