diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-07-10 18:04:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 18:04:55 +0800 |
| commit | 8585cb34092f5857158d4d0a53326992706baa36 (patch) | |
| tree | f3796f3c33922df8775b11891d9bcbfe83e6cccc /pkgs | |
| parent | 873465eede7376d215f189e73f39a5c823da852a (diff) | |
| parent | 656335cd8bd4b09868180a7f87976525d94f95f6 (diff) | |
| download | nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar.gz nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar.bz2 nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar.lz nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar.xz nixlib-8585cb34092f5857158d4d0a53326992706baa36.tar.zst nixlib-8585cb34092f5857158d4d0a53326992706baa36.zip | |
Merge pull request #43115 from talyz/master
linux: Temporary fix for issue #42755
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 69495e5fc439..e0826aaa9d48 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -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"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d49fadac6f18..cf13b0a86264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 ]; }; |