diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
21 files changed, 425 insertions, 284 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix deleted file mode 100644 index 13b27c7d6cc1..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, lib -}: - -mkDerivation rec { - pname = "aqemu"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "tobimensch"; - repo = "aqemu"; - rev = "v${version}"; - sha256 = "1h1mcw8x0jir5p39bs8ka0lcisiyi4jq61fsccgb9hsvl1i8fvk5"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libvncserver qtbase qemu ]; - - meta = with lib; { - description = "A virtual machine manager GUI for qemu"; - homepage = "https://github.com/tobimensch/aqemu"; - license = licenses.gpl2; - maintainers = with maintainers; [ hrdinka ]; - platforms = with platforms; linux; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 4817a9f43567..ee130b377452 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -205,7 +205,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -216,13 +216,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -274,27 +274,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block_util" +name = "block" version = "0.1.0" dependencies = [ + "byteorder", + "crc32c", "io-uring", "libc", "log", - "qcow", + "remain", "smallvec", "thiserror", + "uuid", "versionize", "versionize_derive", - "vhdx", "virtio-bindings", "virtio-queue", "vm-memory", @@ -303,6 +296,15 @@ dependencies = [ ] [[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] name = "blocking" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -318,6 +320,12 @@ dependencies = [ ] [[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] name = "byteorder" version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -337,7 +345,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cloud-hypervisor" -version = "33.0.0" +version = "34.0.0" dependencies = [ "anyhow", "api_client", @@ -377,9 +385,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -439,7 +447,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -450,7 +458,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -473,13 +481,16 @@ dependencies = [ "arch", "bitflags 2.3.3", "byteorder", + "event_monitor", "hypervisor", "libc", "log", + "pci", "thiserror", "tpm", "versionize", "versionize_derive", + "vm-allocator", "vm-device", "vm-memory", "vm-migration", @@ -551,7 +562,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -569,19 +580,19 @@ dependencies = [ [[package]] name = "epoll" -version = "4.3.1" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" +checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "libc", ] [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -608,6 +619,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" name = "event_monitor" version = "0.1.0" dependencies = [ + "flume", "libc", "serde", "serde_json", @@ -629,6 +641,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67" [[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -705,7 +730,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -774,20 +799,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glob" @@ -803,9 +830,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -888,9 +915,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.5.13" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1e1a01cfb924fd8c5c43b6827965db394f5a3a16c599ce03452266e1cf984c" +checksum = "8b7b36074613a723279637061b40db993208908a94f10ccb14436ce735bc0f57" dependencies = [ "bitflags 1.3.2", "libc", @@ -919,9 +946,18 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] [[package]] name = "kvm-bindings" @@ -1067,7 +1103,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#04f5adbf64866d2776f668122f48f317add53b22" +source = "git+https://github.com/rust-vmm/mshv?branch=main#a45fbeb4a3930a2d17142e5687fe2f667c2df529" dependencies = [ "libc", "serde", @@ -1079,7 +1115,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#04f5adbf64866d2776f668122f48f317add53b22" +source = "git+https://github.com/rust-vmm/mshv?branch=main#a45fbeb4a3930a2d17142e5687fe2f667c2df529" dependencies = [ "libc", "mshv-bindings", @@ -1087,6 +1123,15 @@ dependencies = [ ] [[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] name = "net_gen" version = "0.1.0" dependencies = [ @@ -1157,9 +1202,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl-src" @@ -1300,6 +1345,26 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] + +[[package]] name = "pin-project-lite" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1442,29 +1507,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] [[package]] -name = "qcow" -version = "0.1.0" -dependencies = [ - "byteorder", - "libc", - "log", - "remain", - "vmm-sys-util", -] - -[[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -1539,9 +1593,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -1550,19 +1616,19 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "remain" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13cca257d068dd3a390d04b2c3009a3fad2ee5048dfa8f239d048372810470c" +checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1588,9 +1654,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c" dependencies = [ "bitflags 1.3.2", "errno", @@ -1602,15 +1668,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "seccompiler" @@ -1644,7 +1710,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1666,7 +1732,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1688,7 +1754,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1708,9 +1774,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -1751,6 +1817,15 @@ dependencies = [ ] [[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] name = "ssh2" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1787,9 +1862,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -1860,7 +1935,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1930,7 +2005,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1960,9 +2035,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "uuid" @@ -2056,19 +2131,6 @@ dependencies = [ ] [[package]] -name = "vhdx" -version = "0.1.0" -dependencies = [ - "byteorder", - "crc32c", - "libc", - "log", - "remain", - "thiserror", - "uuid", -] - -[[package]] name = "vhost" version = "0.7.0" source = "git+https://github.com/rust-vmm/vhost?branch=main#bdc6f2ab2b3dbd3b9574100ac641a2f8e9667400" @@ -2099,13 +2161,12 @@ name = "vhost_user_block" version = "0.1.0" dependencies = [ "argh", - "block_util", + "block", "env_logger", "epoll", "libc", "log", "option_parser", - "qcow", "vhost", "vhost-user-backend", "virtio-bindings", @@ -2144,11 +2205,10 @@ version = "0.1.0" dependencies = [ "anyhow", "arc-swap", - "block_util", + "block", "byteorder", "epoll", "event_monitor", - "io-uring", "libc", "log", "net_gen", @@ -2254,7 +2314,7 @@ dependencies = [ "arc-swap", "arch", "bitflags 2.3.3", - "block_util", + "block", "blocking", "devices", "epoll", @@ -2271,7 +2331,6 @@ dependencies = [ "once_cell", "option_parser", "pci", - "qcow", "seccompiler", "serde", "serde_json", @@ -2284,7 +2343,6 @@ dependencies = [ "versionize_derive", "vfio-ioctls", "vfio_user", - "vhdx", "virtio-devices", "virtio-queue", "vm-allocator", @@ -2331,6 +2389,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.23", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2495,9 +2607,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" dependencies = [ "memchr", ] @@ -2514,9 +2626,9 @@ dependencies = [ [[package]] name = "zbus" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", "async-executor", @@ -2527,6 +2639,7 @@ dependencies = [ "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", "enumflags2", @@ -2554,24 +2667,23 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", "syn 1.0.109", - "winnow", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ "serde", "static_assertions", @@ -2601,9 +2713,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "enumflags2", @@ -2615,9 +2727,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index bad71e7c73f4..27cffd1c0fed 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "33.0"; + version = "34.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ODhiK0lAN5G9FLBjIdvDl9ya5JKwg8Sv06iDkt44vWc="; + sha256 = "sha256-+uicO6tPLzwlA4/Fao2J8n82Qnt3C6OfqRxn1pVh7XE="; }; cargoLock = { @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; "micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew="; - "mshv-bindings-0.1.1" = "sha256-hmOTu/e1WFk6rc+oXxBja+gFlDqnAIXzyWdiUd+Al1E="; + "mshv-bindings-0.1.1" = "sha256-9Q7IXznZ+qdf/d4gO7qVEjbNUUygQDNYLNxz2BECLHc="; "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; "vfio-bindings-0.4.0" = "sha256-8zdpLD9e1TAwG+m6ifS7/Fh39fAs5VxtnS5gUj/eKmY="; "vfio_user-0.1.0" = "sha256-b/gL6vPMW44O44lBIjqS+hgqVUUskBmttGk5UKIMgZk="; - "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; "vhost-0.7.0" = "sha256-KdVROh44UzZJqtzxfM6gwAokzY6El8iDPfw2nnkmhiQ="; + "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; }; }; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index f07debac98ef..8b04cda31864 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ]; + maintainers = with maintainers; [ offline vdemeester endocrimes ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 7be72b35dd22..f9c15b35e43b 100644 --- a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -5,27 +5,27 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "114.1"; + version = "115.2"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "a8b48953a7d209b32d34fe64e2324cb1113b4336"; - sha256 = "PdP+Jx2oIAy+gxHjJDU5YlAlSYFtoX7ey3r5ELD9QPM="; + rev = "d14053a211eb6753c53ced71fad2d3b402b997e6"; + sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M="; fetchSubmodules = true; }; patches = [ - # Backport fix for non-Glibc. + # Backport option to not vendor virglrenderer. (fetchpatch { - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/8afa6096aa0417ccc5de0213a241dd7ebd25ac0a%5E%21/?format=TEXT"; + url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT"; decode = "base64 -d"; - hash = "sha256-oRwGprs/P2ZG8BM9CMzyEyM8fjuyFINQw4rjTq9rKXA="; + hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU="; }) ]; separateDebugInfo = true; - cargoSha256 = "EhxrtCGrwCcODCjPUONjY1glPGEXbjvk6No/g2kJzI8="; + cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner @@ -39,11 +39,7 @@ rustPlatform.buildRustPackage rec { patchShebangs third_party/minijail/tools/*.py ''; - # crosvm mistakenly expects the stable protocols to be in the root - # of the pkgdatadir path, rather than under the "stable" - # subdirectory. - PKG_CONFIG_WAYLAND_PROTOCOLS_PKGDATADIR = - "${wayland-protocols}/share/wayland-protocols/stable"; + CROSVM_USE_SYSTEM_VIRGLRENDERER = true; buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix new file mode 100644 index 000000000000..aaaca9a47b95 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, ddev }: + +buildGoModule rec { + pname = "ddev"; + version = "1.22.1"; + + src = fetchFromGitHub { + owner = "ddev"; + repo = "ddev"; + rev = "v${version}"; + hash = "sha256-3uDdp827noiY6P7VSBXM34MTe9+MCEkNtuRQ3eFoBnk="; + }; + + vendorHash = null; + + ldflags = [ + "-extldflags -static" + "-X github.com/ddev/ddev/pkg/versionconstants.DdevVersion=${version}" + "-X github.com/ddev/ddev/pkg/versionconstants.SegmentKey=${version}" + ]; + + # Tests need docker. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = ddev; + command = '' + # DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary + # directory. + export HOME=$(mktemp -d) + ddev --version + ''; + }; + + meta = with lib; { + description = "Docker-based local PHP+Node.js web development environments"; + homepage = "https://ddev.com/"; + license = licenses.asl20; + platforms = platforms.unix; + mainProgram = "ddev"; + maintainers = with maintainers; [ star-szr ]; + }; +} diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index 903eb132738a..f2ab0d8f4e78 100644 --- a/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,31 +1,74 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchurl }: +let + # Upstream versioned download links are broken + # NOTE: the archive.org timestamp must be updated if the version changes. + # See https://xenproject.org/downloads/ + files = [ + { + url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar"; + hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar"; + hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar"; + hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA="; + } + { + url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar"; + hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI="; + } + { + url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar"; + hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM="; + } + { + url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar"; + hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490="; + } + { + url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar"; + hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U="; + } + { + url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar"; + hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM="; + } + ]; + +in stdenv.mkDerivation { pname = "win-pvdrivers"; - version = "unstable-2015-07-01"; + version = "unstable-2023-08-17"; - src = fetchFromGitHub { - owner = "ts468"; - repo = "win-pvdrivers"; - rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a"; - sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106"; - }; + srcs = map ({hash, url}: fetchurl { + inherit hash url; + # Wait & retry up to 3 times as archive.org can closes connection + # when an HTTP client makes too many requests + curlOpts = "--retry 3 --retry-delay 5"; + }) files; + + + unpackPhase = '' + runHook preUnpack - buildPhase = - let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]); + for _src in $srcs; do + mkdir -p $out + tar xfv $_src -C $out + done - installPhase = '' - mkdir -p $out - cp -r x86 $out/. - cp -r amd64 $out/. + runHook postUnpack ''; meta = with lib; { - description = "Xen Subproject: Windows PV Driver"; - homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; - maintainers = with maintainers; [ ]; + description = "Xen Subproject: Windows PV Drivers"; + homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/"; + license = licenses.bsd2; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.linux; - license = licenses.bsd3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-qemu/default.nix deleted file mode 100644 index c442d978737e..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, p7zip }: - -stdenv.mkDerivation rec { - pname = "win-qemu"; - version = "0.1.105-1"; - - dontUnpack = true; - - src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; - }; - - buildPhase = '' - ${p7zip}/bin/7z x $src - ''; - - installPhase = - let - copy_pvpanic = arch: version: "mkdir -p $out/${arch}/qemupanic; cp pvpanic/${version}/${arch}/* $out/${arch}/qemupanic/. \n"; - copy_pciserial = arch: "mkdir -p $out/${arch}/qemupciserial; cp qemupciserial/* $out/${arch}/qemupciserial/. \n"; - copy_agent = arch: '' - mkdir -p $out/${arch}/qemuagent - cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi - (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; - copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); - in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); - - meta = with lib; { - description = "Windows QEMU Drivers"; - homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; - maintainers = [ ]; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix deleted file mode 100644 index 7a5cd39a1840..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, p7zip }: - -let - src_x86 = fetchurl { - url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x32_signed_0.11.0.373.msi"; - sha256 = "04r11xw8ikjmcdhrsk878c86g0d0pvras5arsas3zs6dhgjykqap"; - }; - - src_amd64 = fetchurl { - url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x64_signed_0.11.0.373.msi"; - sha256 = "00k628mg9b039p8lmg2l9n81dr15svy70p3m6xmq6f0frmci38ph"; - }; -in - -stdenv.mkDerivation { - pname = "gplpv"; - version = "0.11.0.373"; - - dontUnpack = true; - - buildPhase = '' - mkdir -p x86 - (cd x86; ${p7zip}/bin/7z e ${src_x86}) - mkdir -p amd64 - (cd amd64; ${p7zip}/bin/7z e ${src_amd64}) - ''; - - installPhase = '' - mkdir -p $out/x86 $out/amd64 - cp x86/* $out/x86/. - cp amd64/* $out/amd64/. - ''; - - meta = with lib; { - description = '' - A collection of open source Window PV drivers that allow - Windows to be para-virtualized. - The drivers are signed by Univention with a Software Publishers - Certificate obtained from the VeriSign CA. - ''; - homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; - maintainers = [ ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; - license = licenses.gpl2; - }; - } diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix index 28ce2b4627e2..fbeb12989cb5 100644 --- a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, libarchive }: + stdenv.mkDerivation rec { pname = "win-virtio"; version = "0.1.229-1"; @@ -23,11 +24,15 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Windows VirtIO Drivers"; homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; + changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG"; license = [ licenses.bsd3 ]; - maintainers = [ ]; + maintainers = with maintainers; [ anthonyroussel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh new file mode 100755 index 000000000000..b35dd1d9fcf3 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ | \ + pup 'a[href*="virtio-win-"] text{}' | \ + sed -E 's/virtio-win-(.*)\.noarch\.rpm/\1/' | \ + sort -Vu | \ + tail -n1)" + +update-source-version win-virtio "$version" diff --git a/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix b/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix index 058da0d5351b..86c1da42a222 100644 --- a/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VGP63tGyYD/AtjEZD1uo8A2I/4Di7bfLeeaNat+coI4="; + hash = "sha256-FLqFzEEfgsKcjAevhF6+8mR3zOUjfXyfWwWsxVOcdJU="; }; + vendorHash = null; + ldflags = [ "-X github.com/containerd/containerd/version.Version=${version}" ]; - vendorSha256 = null; subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ]; postFixup = '' diff --git a/nixpkgs/pkgs/applications/virtualization/kraft/default.nix b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix new file mode 100644 index 000000000000..4d2ac7e70300 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "kraftkit"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "unikraft"; + repo = "kraftkit"; + rev = "v${version}"; + hash = "sha256-+aZrJqxgPGIoWEW4PZj6Nib7Z49HitxqMbeoyIe14iM="; + }; + + vendorHash = "sha256-4V7GTqCDSHybuwIrnmO1MJ+DwMpkKOdA7UC72YJqStM="; + + ldflags = [ + "-s" + "-w" + "-X kraftkit.sh/internal/version.version=${version}" + ]; + + subPackages = [ "cmd/kraft" ]; + + meta = { + description = "Build and use highly customized and ultra-lightweight unikernel VMs"; + homepage = "https://github.com/unikraft/kraftkit"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "kraft"; + broken = stdenv.isDarwin; # > machine/platform/iterator_v1alpha1.go:32:34: undefined: hostSupportedStrategies + }; +} diff --git a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index 26466823303e..fab9d6b68017 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.16.0"; + version = "0.17.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "092d586426f85c61263bd4822c22538b1585dc84d0369dccac936db758a17ce1"; + sha256 = "c1b6cd12d13a67918be0f85c1036c2fbc894ef91707cbb9a8c346c0cb371a4e5"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "6c6278ddc2db080b4ad6a2f39ae36e6258efd6c696fbe599a5d389cfb9232aa1"; + sha256 = "cecefed3ae3aadc25b591973db51f89278589cb53605b17282b8afb7c38febab"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "e33301878082cb73eb9bc4f267b91eb4895ac3c8303d56d4b86c1264563bfcff"; + sha256 = "b07fc3af272b7e86ea913a91722f46a8bc6361d74c2db9ca097c88852e444f1d"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "be6093c2a9b0aa3c39cc5a5e39e79223c6d03f0e07ebadf70c3c128143672a84"; + sha256 = "1e455d4d1a213db2521aba3b1d282fcee70e5e42482f32177488539e8b35c103"; }; }; in diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index cf40f599785c..3aed14d9ca95 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6BNUuYAy3rUpPeUsbLRpz0+LdgVeHjlVjmQRcuFSXEg="; + sha256 = "sha256-EVPIb8+0pMDq7sRiG5ERHRW8Lq2NRdHiBj0zPouzwpc="; }; - vendorHash = "sha256-KuMEAlXvW5FhTC7HQa3CoqRlhtwSBzjk+dgAnzScfno="; + vendorHash = "sha256-BrfrCsVJ6ca16dyBHOUXFZHU8JZz2iUxcc2gGf3MF/U="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 93a562d50d79..286a6f74c975 100644 --- a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ joamaki ]; + maintainers = with maintainers; [ joamaki kjeremy ]; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix index 170e9656f032..ce1a439b73ce 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.9.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-0iI417mwmwph4wjuusaWY0kGtVsQy7i+eZvE1tYiINY="; + hash = "sha256-XaZgvy8b/3XUjO/GAQV6fxfqlR+eSMeosC7ugoYsEJM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 2bb3dc24fb0d..41bfc6db7494 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-8cfEZBYhR5CWkHEpIZ0j011gyV6lnY7z4KgJPJr0MfQ="; + hash = "sha256-bGhLjf4GZpuWX1xOC4Hm9SkYvUJ45ZipcKAIEJF0tDQ="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 6b2fae7b23a2..38a285945593 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/spike/default.nix b/nixpkgs/pkgs/applications/virtualization/spike/default.nix index 291328ee7fe8..df967339f8f0 100644 --- a/nixpkgs/pkgs/applications/virtualization/spike/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/spike/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck echo -e "#include<stdio.h>\nint main() {printf(\"Hello, world\");return 0;}" > hello.c - ${riscvPkgs.stdenv.cc}/bin/riscv64-none-elf-gcc -o hello hello.c + ${riscvPkgs.stdenv.cc}/bin/${riscvPkgs.stdenv.cc.targetPrefix}cc -o hello hello.c $out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk hello | grep -Fq "Hello, world" runHook postInstallCheck diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 38eb794426fe..b425ccedb28f 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,6 +4,7 @@ , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib , yasm, glslang +, linuxPackages # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin @@ -212,6 +213,10 @@ in stdenv.mkDerivation { ''} cp -rv out/linux.*/${buildType}/bin/src "$modsrc" + + mkdir -p "$out/share/virtualbox" + cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" + ln -s "${linuxPackages.virtualboxGuestAdditions.src}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; preFixup = optionalString (!headless) '' |