Skip to content

Commit 4235411

Browse files
phip1611scholzp
authored andcommitted
flake/chv: bump cloud-hypervisor-src + adapt to new crate structure
Since PR #7525 (Dec 2025)[0], Cloud Hypervisor uses a virtual Cargo manifest and the main package was moved to the `./cloud-hypervisor` subdirectory. This change is effective since v50, which we just upgraded our Cloud Hypervisor patchset to [1]. [0] cloud-hypervisor/cloud-hypervisor#7525 [1] cyberus-technology/cloud-hypervisor#60 Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de> On-behalf-of: SAP philipp.schuster@sap.com
1 parent 55bdafd commit 4235411

File tree

2 files changed

+33
-25
lines changed

2 files changed

+33
-25
lines changed

chv.nix

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,39 @@ let
1414
# Crane lib with proper Rust toolchain
1515
craneLib' = craneLib.overrideToolchain rustToolchain;
1616

17-
commonArgs = {
18-
meta = cloud-hypervisor-meta;
19-
src = craneLib'.cleanCargoSource cloud-hypervisor-src;
17+
commonArgs =
18+
let
19+
src = craneLib'.cleanCargoSource cloud-hypervisor-src;
20+
in
21+
{
22+
inherit src;
23+
# Since Nov 2025 (v50), Cloud Hypervisor has a virtual manifest and the
24+
# main package was moved into a sub directory.
25+
cargoToml = "${src}/cloud-hypervisor/Cargo.toml";
2026

21-
# Pragmatic release profile with debug-ability and faster
22-
# compilation times in mind.
23-
env = {
24-
CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS = "true";
25-
CARGO_PROFILE_RELEASE_OPT_LEVEL = 2;
26-
CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS = "true";
27-
CARGO_PROFILE_RELEASE_LTO = "no";
27+
meta = cloud-hypervisor-meta;
2828

29-
# Fix build. Reference:
30-
# - https://github.com/sfackler/rust-openssl/issues/1430
31-
# - https://docs.rs/openssl/latest/openssl/
32-
OPENSSL_NO_VENDOR = true;
33-
};
29+
# Pragmatic release profile with debug-ability and faster
30+
# compilation times in mind.
31+
env = {
32+
CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS = "true";
33+
CARGO_PROFILE_RELEASE_OPT_LEVEL = 2;
34+
CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS = "true";
35+
CARGO_PROFILE_RELEASE_LTO = "no";
36+
37+
# Fix build. Reference:
38+
# - https://github.com/sfackler/rust-openssl/issues/1430
39+
# - https://docs.rs/openssl/latest/openssl/
40+
OPENSSL_NO_VENDOR = true;
41+
};
3442

35-
nativeBuildInputs = [
36-
pkg-config
37-
];
38-
buildInputs = [
39-
openssl
40-
];
41-
};
43+
nativeBuildInputs = [
44+
pkg-config
45+
];
46+
buildInputs = [
47+
openssl
48+
];
49+
};
4250

4351
# Downloaded and compiled dependencies.
4452
cargoArtifacts = craneLib'.buildDepsOnly (

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)