From 24075e0c393e495c90247d223a5a0563b3059a6b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Nov 2025 17:16:59 +0100 Subject: [PATCH] cloud-hypervisor: backport Rust 1.90 crash fixes Since we're using Rust 1.90+ in Nixpkgs, we should be using these fixes as well. --- pkgs/by-name/cl/cloud-hypervisor/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 61934b2a2bb4..86b9a1aabd0c 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, rustPlatform, pkg-config, dtc, @@ -19,6 +20,19 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bPPs/4XMcvOH4BGfQrjQdvgjGWae4UEZjzPKjalDN3w="; }; + patches = [ + (fetchpatch { + name = "vsock-seccomp-Rust-1.90.patch"; + url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/ec57aade1563075e37b8e9ccc0b85fe2c04a54b8.patch"; + hash = "sha256-M+I+ZbiNDV1a8Y46+/mPTyDlQgQS7G6ytvPgli0NhJ0="; + }) + (fetchpatch { + name = "vfio-user-seccomp-Rust-1.90.patch"; + url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/95b8c6afdd6eec9810243f92ec1956dccfe305da.patch"; + hash = "sha256-kCP/Fu0Dg+GdnwyFQLqZWKlbqO9w4KRJcbV4sReSDYM="; + }) + ]; + cargoHash = "sha256-5EK9V9yiF/UjmlYSKBIJgQOA1YU33ezicLikWYnKFAo="; separateDebugInfo = true;