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

Merge pull request #43115 from talyz/master

Browse Source 
linux: Temporary fix for issue #42755
This commit is contained in:
adisbladis 2018-07-10 18:04:55 +08:00 committed by GitHub
commit 8585cb3409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,4 +59,24 @@ rec {
};
};
# https://github.com/NixOS/nixpkgs/issues/42755
xen-netfront_fix_mismatched_rtnl_unlock = rec {
name = "xen-netfront_fix_mismatched_rtnl_unlock";
patch = fetchpatch {
name = name + ".patch";
url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch;
sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8";
};
};
# https://github.com/NixOS/nixpkgs/issues/42755
xen-netfront_update_features_after_registering_netdev = rec {
name = "xen-netfront_update_features_after_registering_netdev";
patch = fetchpatch {
name = name + ".patch";
url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch;
sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
};
};
}

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

@ -13699,6 +13699,11 @@ with pkgs;
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.modinst_arg_list_too_long
# https://github.com/NixOS/nixpkgs/issues/42755
# Remove these xen-netfront patches once they're included in
# upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
kernelPatches.xen-netfront_update_features_after_registering_netdev
];
};
@ -13707,6 +13712,11 @@ with pkgs;
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long
# https://github.com/NixOS/nixpkgs/issues/42755
# Remove these xen-netfront patches once they're included in
# upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
kernelPatches.xen-netfront_update_features_after_registering_netdev
];
};
@ -13717,6 +13727,11 @@ with pkgs;
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
# https://github.com/NixOS/nixpkgs/issues/42755
# Remove these xen-netfront patches once they're included in
# upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
kernelPatches.xen-netfront_update_features_after_registering_netdev
];
};
@ -13728,6 +13743,11 @@ with pkgs;
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
# https://github.com/NixOS/nixpkgs/issues/42755
# Remove these xen-netfront patches once they're included in
# upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
kernelPatches.xen-netfront_update_features_after_registering_netdev
];
};