nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cloud-hypervisor: 0.8.0 -> 0.14.1

Browse Source
This commit is contained in:
Alyssa Ross 2021-04-04 19:37:00 +00:00
parent 101cc9024b
commit 5fa10aa313
2 changed files with 7 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch
View File

@ -1,53 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index e566ed25..a661a963 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -689,7 +689,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)",
+ "vfio-bindings",
"vfio-ioctls",
"vm-allocator",
"vm-device",
@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "vfio-bindings"
version = "0.2.0"
-source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
dependencies = [
"vmm-sys-util",
]
-[[package]]
-name = "vfio-bindings"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
-
[[package]]
name = "vfio-ioctls"
version = "0.1.0"
@@ -1366,7 +1361,7 @@ dependencies = [
"kvm-bindings",
"kvm-ioctls",
"log 0.4.8",
- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vfio-bindings",
"vm-memory",
"vmm-sys-util",
]
diff --git a/pci/Cargo.toml b/pci/Cargo.toml
index 9c6955c7..4ecf8e6b 100644
--- a/pci/Cargo.toml
+++ b/pci/Cargo.toml
@@ -23,5 +23,5 @@ vm-memory = "0.2.1"
vm-migration = { path = "../vm-migration" }
[dependencies.vfio-bindings]
-git = "https://github.com/rust-vmm/vfio-bindings"
+version = "0.2.0"
features = ["fam-wrappers"]

15
pkgs/applications/virtualization/cloud-hypervisor/default.nix
View File

@ -1,28 +1,27 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, dtc, openssl }:
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
version = "0.8.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI=";
sha256 = "0pnfg6dzpz8v40cwg3dmlj52x8pblavv7mkczar814dwbk01y7vr";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
cargoPatches = [ ./cargo-lock-vendor-fix.patch ];
cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ=";
cargoSha256 = "0dbjds40znly11i0ssfv66w82ynxp00ixw1349m5ln9i9ms94sr4";
meta = with lib; {
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM";
changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}";
license = with licenses; [ asl20 bsd3 ];
maintainers = with maintainers; [ offline ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ offline qyliss ];
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
}