nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: Apply 9p veryloose patch to 4.9

Browse Source
This commit is contained in:
Eelco Dolstra 2017-01-24 11:37:35 +01:00
parent b3b300b6ff
commit a82810c7a7
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,12 +175,12 @@ rec {
}; };
}; };
p9_caching_4_4 = rec p9_caching_4_9 = rec
{ name = "9p-caching.patch"; { name = "9p-caching.patch";
patch = fetchpatch { patch = fetchpatch {
inherit name; inherit name;
url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch;
sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a";
}; };
}; };

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

@ -11243,7 +11243,6 @@ in
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.p9_caching_4_4
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -11260,6 +11259,7 @@ in
# !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7" # kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.p9_caching_4_9
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -11272,6 +11272,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.p9_caching_4_9
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill