From 973542f89a32734a6a48126ed35bf29a0321ec4d Mon Sep 17 00:00:00 2001 From: usertam Date: Wed, 30 Oct 2024 17:05:54 +0800 Subject: [PATCH 01/24] firecracker: 1.9.0 -> 1.9.1, build from source --- maintainers/maintainer-list.nix | 6 + pkgs/by-name/fi/firecracker/Cargo.lock | 1768 +++++++++++++++++++++++ pkgs/by-name/fi/firecracker/package.nix | 103 +- 3 files changed, 1831 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/fi/firecracker/Cargo.lock diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b9d764cd96b..84566dca8302 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22536,6 +22536,12 @@ githubId = 17836748; name = "Mason Mackaman"; }; + usertam = { + email = "nix@usertam.dev"; + github = "usertam"; + githubId = 22500027; + name = "Samuel Tam"; + }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; diff --git a/pkgs/by-name/fi/firecracker/Cargo.lock b/pkgs/by-name/fi/firecracker/Cargo.lock new file mode 100644 index 000000000000..27488b493909 --- /dev/null +++ b/pkgs/by-name/fi/firecracker/Cargo.lock @@ -0,0 +1,1768 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "acpi_tables" +version = "0.1.0" +dependencies = [ + "displaydoc", + "thiserror", + "vm-memory", + "zerocopy", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-lc-fips-sys" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d41a5d02120c5eca009507574fa0d4885fa370cbda6b561d91ba463c3025a7" +dependencies = [ + "bindgen 0.69.4", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "aws-lc-rs" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +dependencies = [ + "aws-lc-fips-sys", + "aws-lc-sys", + "mirai-annotations", + "paste", + "untrusted", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" +dependencies = [ + "bindgen 0.69.4", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cargo_toml" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-num" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e063d263364859dc54fb064cedb7c122740cd4733644b14b176c097f51e8ab7" +dependencies = [ + "num-traits", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clippy-tracing" +version = "0.1.0" +dependencies = [ + "clap", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", + "uuid", + "walkdir", +] + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "cpu-template-helper" +version = "1.9.1" +dependencies = [ + "clap", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "vmm", + "vmm-sys-util", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc64" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3" + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "device_tree" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18f717c5c7c2e3483feb64cccebd077245ad6d19007c2db0fd341d38595353c" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-manager" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b16fe5161a1160c9c7cece9f7504f2412ef5e2c0643d1e322eccf37692a42b" +dependencies = [ + "libc", + "vmm-sys-util", +] + +[[package]] +name = "firecracker" +version = "1.9.1" +dependencies = [ + "bincode", + "cargo_toml", + "displaydoc", + "event-manager", + "libc", + "log-instrument", + "micro_http", + "regex", + "seccompiler", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "timerfd", + "userfaultfd", + "utils", + "vmm", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jailer" +version = "1.9.1" +dependencies = [ + "libc", + "log-instrument", + "nix 0.29.0", + "regex", + "thiserror", + "utils", +] + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "kvm-bindings" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efe3f1a4437bffe000e6297a593b98184213cd27486776c335f95ab53d48e3a" +dependencies = [ + "serde", + "vmm-sys-util", + "zerocopy", +] + +[[package]] +name = "kvm-ioctls" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c2176b91f68903b54ac8c6185bada7d607ca6110998976ff15c032f88a7d39" +dependencies = [ + "bitflags 2.6.0", + "kvm-bindings", + "libc", + "vmm-sys-util", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "linux-loader" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83" +dependencies = [ + "vm-memory", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "serde", +] + +[[package]] +name = "log-instrument" +version = "0.3.0" +dependencies = [ + "env_logger", + "log", + "log-instrument-macros", +] + +[[package]] +name = "log-instrument-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix", +] + +[[package]] +name = "micro_http" +version = "0.1.0" +source = "git+https://github.com/firecracker-microvm/micro-http#8182cd5523b63ceb52ad9d0e7eb6fb95683e6d1b" +dependencies = [ + "libc", + "vmm-sys-util", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "once_cell" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +dependencies = [ + "bitflags 2.6.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "unarray", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rebase-snap" +version = "1.9.1" +dependencies = [ + "displaydoc", + "libc", + "log-instrument", + "thiserror", + "utils", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "seccompiler" +version = "1.9.1" +dependencies = [ + "bincode", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "utils", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "snapshot-editor" +version = "1.9.1" +dependencies = [ + "clap", + "clap-num", + "displaydoc", + "libc", + "log-instrument", + "semver", + "thiserror", + "utils", + "vmm", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "timerfd" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" +dependencies = [ + "rustix", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "userfaultfd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d8b176d4d3e420685e964f87c25df5fdd5b26d7eb0d0e7c892d771f5b81035" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", + "nix 0.27.1", + "thiserror", + "userfaultfd-sys", +] + +[[package]] +name = "userfaultfd-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75595d2a62b7db16bd47f5a1ce14e1fe05ccbe27d6c96721a958e0a027cad41" +dependencies = [ + "bindgen 0.68.1", + "cc", + "cfg-if", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utils" +version = "0.1.0" +dependencies = [ + "derive_more", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "vm-memory", + "vmm-sys-util", +] + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vhost" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc" +dependencies = [ + "bitflags 2.6.0", + "libc", + "vm-memory", + "vmm-sys-util", +] + +[[package]] +name = "vm-allocator" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4ce718bd4e8d74b1747363e27f715a6b1bd6971597cb21425dadbf4e712241" +dependencies = [ + "libc", + "thiserror", +] + +[[package]] +name = "vm-fdt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e21282841a059bb62627ce8441c491f09603622cd5a21c43bfedc85a2952f23" + +[[package]] +name = "vm-memory" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "vm-superio" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3428ee25acbfc75ed14600f2043876e0889cbd57c39dd441191417377cdceda0" + +[[package]] +name = "vmm" +version = "0.1.0" +dependencies = [ + "acpi_tables", + "aes-gcm", + "aws-lc-rs", + "base64", + "bincode", + "bitflags 2.6.0", + "crc64", + "criterion", + "derive_more", + "device_tree", + "displaydoc", + "event-manager", + "itertools 0.13.0", + "kvm-bindings", + "kvm-ioctls", + "lazy_static", + "libc", + "linux-loader", + "log", + "log-instrument", + "memfd", + "micro_http", + "proptest", + "seccompiler", + "semver", + "serde", + "serde_json", + "slab", + "smallvec", + "thiserror", + "timerfd", + "userfaultfd", + "utils", + "vhost", + "vm-allocator", + "vm-fdt", + "vm-memory", + "vm-superio", + "zerocopy", +] + +[[package]] +name = "vmm-sys-util" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" +dependencies = [ + "bitflags 1.3.2", + "libc", + "serde", + "serde_derive", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index ffd22a70bf03..c16710e54712 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -1,59 +1,72 @@ { - fetchurl, lib, stdenv, + fetchFromGitHub, + makeRustPlatform, + rustc, + cargo, + llvmPackages, + cmake, + gcc, + + # gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy' + # error: '__builtin_memcpy' specified bound exceeds maximum object size + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397 + useRustPlatform ? makeRustPlatform { + inherit rustc cargo; + inherit (llvmPackages) stdenv; + }, }: -let - version = "1.9.0"; - # nixpkgs-update: no auto update - - suffix = - { - x86_64-linux = "x86_64"; - aarch64-linux = "aarch64"; - } - ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - - dlbin = - hash: - fetchurl { - url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - hash = - hash."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - -in -stdenv.mkDerivation { +useRustPlatform.buildRustPackage rec { pname = "firecracker"; - inherit version; + version = "1.9.1"; - sourceRoot = "."; - src = dlbin { - x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc="; - aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k="; + src = fetchFromGitHub { + owner = "firecracker-microvm"; + repo = "firecracker"; + rev = "v${version}"; + hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ="; }; - dontConfigure = true; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo="; + }; + }; - buildPhase = '' - mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker - mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer - chmod +x firecracker jailer - ''; + nativeBuildInputs = [ + cmake + gcc + useRustPlatform.bindgenHook + ]; - doCheck = true; - checkPhase = '' - ./firecracker --version - ./jailer --version - ''; + cargoBuildFlags = [ "--workspace" ]; + + checkFlags = [ + # requires /sys/devices/virtual/dmi + "--skip=fingerprint::dump::tests::test_read_valid_sysfs_file" + # requires /dev/kvm + "--skip=template::dump::tests::test_dump" + "--skip=tests::test_fingerprint_dump_command" + "--skip=tests::test_template_dump_command" + "--skip=tests::test_template_verify_command" + "--skip=utils::tests::test_build_microvm" + # requires seccomp == 0 + "--skip=tests::test_filter_apply" + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin - install -D firecracker $out/bin/firecracker - install -D jailer $out/bin/jailer + releaseDir="build/cargo_target/${stdenv.hostPlatform.rust.rustcTarget}/release" + for bin in $(find $releaseDir -maxdepth 1 -type f -executable); do + install -Dm555 -t $out/bin $bin + done + + runHook postInstall ''; meta = with lib; { @@ -62,11 +75,9 @@ stdenv.mkDerivation { changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}"; mainProgram = "firecracker"; license = licenses.asl20; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; + platforms = lib.platforms.linux; maintainers = with maintainers; [ + usertam thoughtpolice qjoly techknowlogick From 0488b87eb9e565738a1ab0c82a62fd192383f040 Mon Sep 17 00:00:00 2001 From: kmatas <33095685+kmatasfp@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:35:54 -0800 Subject: [PATCH 02/24] maintainers: add kmatasfp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7fc737a9cd4..dad7a958e7d0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11916,6 +11916,12 @@ githubId = 12898828; keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF DD8B 8609 A7B5 19E5 E342"; } ]; }; + kmatasfp = { + email = "el-development@protonmail.com"; + name = "Kaur Matas"; + github = "kmatasfp"; + githubId = 33095685; + }; kmcopper = { email = "kmcopper@danwin1210.me"; name = "Kyle Copperfield"; From fa5d09824b718fd8c749ca2feeae886ed2a49a18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 06:37:39 +0000 Subject: [PATCH 03/24] opentelemetry-collector-builder: 0.115.0 -> 0.116.0 --- pkgs/tools/misc/opentelemetry-collector/builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 53b9cf658a38..fc7500cb6e67 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.115.0"; + version = "0.116.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-wl0ThYbDTVLuN9FkrsHF1prydrPMIaiK/9s2Ipeqfik="; + hash = "sha256-1wFLeRbiNytPEe262TEhBrAOLUkbsdLzKYngN2S3O4E="; }; sourceRoot = "${src.name}/cmd/builder"; From d1b63e603c1b2aa288770c3a9085d1fe9df726bb Mon Sep 17 00:00:00 2001 From: Ryota Kameoka Date: Thu, 19 Dec 2024 19:13:02 +0900 Subject: [PATCH 04/24] gh-gei: 1.9.0 -> 1.11.0 --- pkgs/by-name/gh/gh-gei/deps.json | 64 +++++++++++++++--------------- pkgs/by-name/gh/gh-gei/package.nix | 6 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/gh/gh-gei/deps.json b/pkgs/by-name/gh/gh-gei/deps.json index fcef88bbd13e..a009cc4c2606 100644 --- a/pkgs/by-name/gh/gh-gei/deps.json +++ b/pkgs/by-name/gh/gh-gei/deps.json @@ -2,161 +2,161 @@ { "pname": "AWSSDK.Core", "version": "3.7.300.11", - "sha256": "1460yndb9gfy4qx36g4lxaqxzb3p19kfqp7czi28i1p7z7nh38vi" + "hash": "sha256-caMB7fnnhohE/Oxc7GYKd6zfseqUPDM6Jt69tJr1wJA=" }, { "pname": "AWSSDK.S3", "version": "3.7.304", - "sha256": "0hjls7477rm3g7bvd8m7ch37lmllnsv71x1lhjjn8g2nk7d3lk0q" + "hash": "sha256-GEw62plWPGSlhDT0cLa2lFZ6BmSnorbXeaPmc8jRVEI=" }, { "pname": "Azure.Core", "version": "1.36.0", - "sha256": "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn" + "hash": "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI=" }, { "pname": "Azure.Storage.Blobs", "version": "12.19.1", - "sha256": "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k" + "hash": "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U=" }, { "pname": "Azure.Storage.Common", "version": "12.18.1", - "sha256": "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k" + "hash": "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "1.1.1", - "sha256": "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw" + "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", - "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3" + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", - "sha256": "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58" + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", "version": "4.7.0", - "sha256": "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w" + "hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", "version": "4.7.0", - "sha256": "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh" + "hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M=" }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "7.0.0", - "sha256": "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p" + "hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "7.0.0", - "sha256": "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7" + "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA=" }, { "pname": "Microsoft.Extensions.Http", "version": "7.0.0", - "sha256": "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw" + "hash": "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q=" }, { "pname": "Microsoft.Extensions.Logging", "version": "7.0.0", - "sha256": "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf" + "hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "7.0.0", - "sha256": "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs" + "hash": "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74=" }, { "pname": "Microsoft.Extensions.Options", "version": "7.0.0", - "sha256": "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6" + "hash": "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "7.0.0", - "sha256": "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80" + "hash": "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", - "sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7" + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "Polly", "version": "7.2.4", - "sha256": "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1" + "hash": "sha256-wQvK3XmQlplyI/duVkhM+iRhikGBLwrQ8cpcFJSIcFM=" }, { "pname": "System.Collections.Immutable", "version": "7.0.0", - "sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm" + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.22272.1", - "sha256": "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd" + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" }, { "pname": "System.CommandLine.NamingConventionBinder", "version": "2.0.0-beta4.22272.1", - "sha256": "07hcz8jcqla4fs7cd2r0lanqsa13nl9l37spby9bc5p2apkyrz0m" + "hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", - "sha256": "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy" + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" }, { "pname": "System.IO.Hashing", "version": "6.0.0", - "sha256": "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41" + "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" }, { "pname": "System.Linq.Async", "version": "6.0.1", - "sha256": "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq" + "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" }, { "pname": "System.Memory.Data", "version": "1.0.2", - "sha256": "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay" + "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.Reflection.Metadata", "version": "7.0.0", - "sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v" + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { "pname": "System.Text.Encodings.Web", "version": "4.7.2", - "sha256": "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9" + "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" }, { "pname": "System.Text.Json", "version": "4.7.2", - "sha256": "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4" + "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" } ] diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 0f3fa3aefe4f..a3b954862c1a 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -6,16 +6,16 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "github"; repo = pname; rev = "v${version}"; - hash = "sha256-6lEEeAYrMB9wwATsORuaS21wLOB+gq/od88FobSse50="; + hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. From 5df9852ab27d45979c15ce36485e873b78b7b87b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:31:26 +0000 Subject: [PATCH 05/24] tt-rss: 0-unstable-2024-11-04 -> 0-unstable-2024-12-20 --- pkgs/servers/tt-rss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index b1b0c1d68527..058d8019b4d6 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "0-unstable-2024-11-04"; + version = "0-unstable-2024-12-20"; src = fetchgit { url = "https://git.tt-rss.org/fox/tt-rss.git"; - rev = "42ebdb027ec249fb8e693c41d7ee80ecdc68d6ec"; - hash = "sha256-QN7CwUufQSFlFde0NebO/kOYtEZCyL0ut+CNEpJMIMA="; + rev = "7b727156780236cb639c52e45d07cc80c1f2b0d3"; + hash = "sha256-b3z1cfM0El6yW7sCq8FSoN0sNa07HA4zLSUrEFX8ICM="; }; installPhase = '' From 44cdb6bca76de00a0fc9c84b73e85a75cf6fac75 Mon Sep 17 00:00:00 2001 From: Maj Fontana Date: Fri, 20 Dec 2024 14:15:30 +0100 Subject: [PATCH 06/24] welle-io: enable FLAC support --- pkgs/applications/radio/welle-io/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 5a4ce6a9bca1..6f3e82e93022 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -17,6 +17,8 @@ fftwSinglePrec, lame, mpg123, + withFlac ? true, + flac, }: stdenv.mkDerivation rec { @@ -48,12 +50,12 @@ stdenv.mkDerivation rec { qt5compat rtl-sdr soapysdr-with-plugins - ]; + ] ++ lib.optional withFlac flac; cmakeFlags = [ "-DRTLSDR=true" "-DSOAPYSDR=true" - ]; + ] ++ lib.optional withFlac "-DFLAC=true"; meta = { description = "DAB/DAB+ Software Radio"; From 6c736be0a1b37863623bd3166cb5e10d6c442880 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:26:47 +0000 Subject: [PATCH 07/24] wireguard-vanity-keygen: 0.1.0 -> 0.1.1 --- pkgs/by-name/wi/wireguard-vanity-keygen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index c596fb9eeb4a..f1b9e3336996 100644 --- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "wireguard-vanity-keygen"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "axllent"; repo = "wireguard-vanity-keygen"; rev = version; - hash = "sha256-L+YssChpGNQs2MLGXul1sxVmROOWfT0aaZMepGuKmEQ="; + hash = "sha256-LibNWnjm52iPwrPKAA5v3krADvHcewKuLe9k5HhJgzg="; }; - vendorHash = "sha256-kAPw5M9o99NijCC9BzYhIpzHK/8fSAJxvckaj8iRby0="; + vendorHash = "sha256-sHVdR1zuewT9B4UlPrEWU5V9MjgkwPBh/hkSsn2PQKw="; ldflags = [ "-s" From 534c3e67c1f875b48a172b26b24997c22c009017 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:43:10 +0200 Subject: [PATCH 08/24] voicevox-core: init at 0.15.4 --- pkgs/by-name/vo/voicevox-core/package.nix | 74 +++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox-core/package.nix diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix new file mode 100644 index 000000000000..0283b9cbfb4c --- /dev/null +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, +}: + +let + platformInfoTable = { + "x86_64-linux" = { + id = "linux-x64"; + hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM="; + }; + "aarch64-linux" = { + id = "linux-arm64"; + hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648="; + }; + "x86_64-darwin" = { + id = "osx-x64"; + hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg="; + }; + "aarch64-darwin" = { + id = "osx-arm64"; + hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk="; + }; + }; + + platformInfo = + platformInfoTable.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation (finalAttrs: { + pname = "voicevox-core"; + version = "0.15.4"; + + # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models + src = fetchzip { + url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip"; + inherit (platformInfo) hash; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + installPhase = '' + runHook preInstall + + install -Dm755 libonnxruntime.* libvoicevox_core.* -t $out/lib + install -Dm644 model/* -t $out/lib/model + install -Dm644 *.h -t $out/include + install -Dm644 README.txt -t $out/share/doc/voicevox-core + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}"; + description = "Core library for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox_core"; + license = with lib.licenses; [ + mit + ({ + name = "VOICEVOX Core Library Terms of Use"; + url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/core/README.md"; + free = false; + redistributable = true; + }) + ]; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.attrNames platformInfoTable; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) From 281176b9bf0b987ca96602e747f1cd72986c1a84 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:43:26 +0200 Subject: [PATCH 09/24] voicevox-engine: init at 0.20.0 --- .../vo/voicevox-engine/make-installable.patch | 21 +++ .../mecab-remove-deprecated.patch | 92 +++++++++++++ pkgs/by-name/vo/voicevox-engine/package.nix | 126 ++++++++++++++++++ .../vo/voicevox-engine/pyopenjtalk.nix | 75 +++++++++++ 4 files changed, 314 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox-engine/make-installable.patch create mode 100644 pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch create mode 100644 pkgs/by-name/vo/voicevox-engine/package.nix create mode 100644 pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix diff --git a/pkgs/by-name/vo/voicevox-engine/make-installable.patch b/pkgs/by-name/vo/voicevox-engine/make-installable.patch new file mode 100644 index 000000000000..6cc3b04ad05b --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/make-installable.patch @@ -0,0 +1,21 @@ +diff --git a/pyproject.toml b/pyproject.toml +index fa23446..6a7705c 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -40,7 +40,15 @@ use_parentheses = true + datas = "datas" # PyInstaller's argument + + [tool.poetry] +-package-mode = false ++name = "voicevox-engine" ++version = "@version@" ++authors = [] ++description = "" ++packages = [ { include = "voicevox_engine" } ] ++include = [ "resources/**/*", "run.py", "engine_manifest.json", "presets.yaml"] ++ ++[tool.poetry.scripts] ++voicevox-engine = "run:main" + + [tool.poetry.dependencies] + python = "~3.11" diff --git a/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch b/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch new file mode 100644 index 000000000000..b9ac0e1c1079 --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch @@ -0,0 +1,92 @@ +diff --git a/lib/open_jtalk/src/mecab/src/char_property.h b/lib/open_jtalk/src/mecab/src/char_property.h +index 35f4b05..9c904ba 100644 +--- a/lib/open_jtalk/src/mecab/src/char_property.h ++++ b/lib/open_jtalk/src/mecab/src/char_property.h +@@ -37,7 +37,7 @@ class CharProperty { + inline const char *seekToOtherType(const char *begin, const char *end, + CharInfo c, CharInfo *fail, + size_t *mblen, size_t *clen) const { +- register const char *p = begin; ++ const char *p = begin; + *clen = 0; + while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) { + p += *mblen; +diff --git a/lib/open_jtalk/src/mecab/src/darts.h b/lib/open_jtalk/src/mecab/src/darts.h +index 91b2eae..d6736cf 100644 +--- a/lib/open_jtalk/src/mecab/src/darts.h ++++ b/lib/open_jtalk/src/mecab/src/darts.h +@@ -404,10 +404,10 @@ class DoubleArrayImpl { + T result; + set_result(result, -1, 0); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b +(node_u_type_)(key[i]) + 1; + if (static_cast(b) == array_[p].check) + b = array_[p].base; +@@ -431,12 +431,12 @@ class DoubleArrayImpl { + size_t node_pos = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register size_t num = 0; +- register array_type_ n; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ size_t num = 0; ++ array_type_ n; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b; // + 0; + n = array_[p].base; + if ((array_u_type_) b == array_[p].check && n < 0) { +@@ -469,8 +469,8 @@ class DoubleArrayImpl { + size_t len = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + + for (; key_pos < len; ++key_pos) { + p = b +(node_u_type_)(key[key_pos]) + 1; +diff --git a/lib/open_jtalk/src/mecab/src/dictionary.cpp b/lib/open_jtalk/src/mecab/src/dictionary.cpp +index 5717d4d..3ab6e1f 100644 +--- a/lib/open_jtalk/src/mecab/src/dictionary.cpp ++++ b/lib/open_jtalk/src/mecab/src/dictionary.cpp +@@ -66,7 +66,7 @@ int progress_bar_darts(size_t current, size_t total) { + } + + template +-struct pair_1st_cmp: public std::binary_function { ++struct pair_1st_cmp { + bool operator()(const std::pair &x1, + const std::pair &x2) { + return x1.first < x2.first; +diff --git a/lib/open_jtalk/src/mecab/src/viterbi.cpp b/lib/open_jtalk/src/mecab/src/viterbi.cpp +index 6277fe9..5ccefb7 100644 +--- a/lib/open_jtalk/src/mecab/src/viterbi.cpp ++++ b/lib/open_jtalk/src/mecab/src/viterbi.cpp +@@ -318,11 +318,11 @@ template bool connect(size_t pos, Node *rnode, + const Connector *connector, + Allocator *allocator) { + for (;rnode; rnode = rnode->bnext) { +- register long best_cost = 2147483647; ++ long best_cost = 2147483647; + Node* best_node = 0; + for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) { +- register int lcost = connector->cost(lnode, rnode); // local cost +- register long cost = lnode->cost + lcost; ++ int lcost = connector->cost(lnode, rnode); // local cost ++ long cost = lnode->cost + lcost; + + if (cost < best_cost) { + best_node = lnode; diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix new file mode 100644 index 000000000000..bc9a67617e9f --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -0,0 +1,126 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + replaceVars, + voicevox-core, +}: + +python3Packages.buildPythonApplication rec { + pname = "voicevox-engine"; + version = "0.20.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_engine"; + rev = "refs/tags/${version}"; + hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc="; + }; + + patches = [ + # the upstream package only uses poetry for dependency management, not for package definition + # this patch makes the package installable via poetry-core + (replaceVars ./make-installable.patch { + inherit version; + }) + ]; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = + [ + passthru.pyopenjtalk + ] + ++ (with python3Packages; [ + numpy + fastapi + jinja2 + python-multipart + uvicorn + soundfile + pyyaml + pyworld + semver + platformdirs + soxr + pydantic + starlette + ]); + + pythonRemoveDeps = [ + # upstream wants fastapi-slim, but we provide fastapi instead + "fastapi-slim" + ]; + + pythonRelaxDeps = true; + + preConfigure = '' + # copy demo metadata to temporary directory + mv resources/character_info test_character_info + + # populate the `character_info` directory with the actual model metadata instead of the demo metadata + cp -r --no-preserve=all ${passthru.resources}/character_info resources/character_info + + # the `character_info` directory copied from `resources` doesn't exactly have the expected format, + # so we transform them to be acceptable by `voicevox-engine` + pushd resources/character_info + for dir in *; do + # remove unused large files + rm $dir/*/*.png_large + + # rename directory from "$name_$uuid" to "$uuid" + mv $dir ''${dir#*"_"} + done + popd + ''; + + makeWrapperArgs = [ + ''--add-flags "--voicelib_dir=${voicevox-core}/lib"'' + ]; + + preCheck = '' + # some tests assume $HOME actually exists + export HOME=$(mktemp -d) + + # since the actual metadata files have been installed to `$out` by this point, + # we can move the demo metadata back to its place for the tests to succeed + rm -r resources/character_info + mv test_character_info resources/character_info + ''; + + disabledTests = [ + # this test checks the behaviour of openapi + # one of the functions returns a slightly different output due to openapi version differences + "test_OpenAPIの形が変わっていないことを確認" + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + syrupy + httpx + ]; + + passthru = { + resources = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_resource"; + rev = "refs/tags/${version}"; + hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM="; + }; + + pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; + }; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}"; + description = "Engine for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox_engine"; + license = lib.licenses.lgpl3Only; + mainProgram = "voicevox-engine"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix new file mode 100644 index 000000000000..01ef7ec6ee84 --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix @@ -0,0 +1,75 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + fetchzip, + setuptools, + cython_0, + cmake, + numpy, + oldest-supported-numpy, + six, + tqdm, +}: + +let + dic-dirname = "open_jtalk_dic_utf_8-1.11"; + dic-src = fetchzip { + url = "https://github.com/r9y9/open_jtalk/releases/download/v1.11.1/${dic-dirname}.tar.gz"; + hash = "sha256-+6cHKujNEzmJbpN9Uan6kZKsPdwxRRzT3ZazDnCNi3s="; + }; +in +buildPythonPackage { + pname = "pyopenjtalk"; + version = "0-unstable-2023-09-08"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "pyopenjtalk"; + rev = "b35fc89fe42948a28e33aed886ea145a51113f88"; + hash = "sha256-DbZkCMdirI6wSRUQSJrkojyjGmViqGeQPO0kSKiw2gE="; + fetchSubmodules = true; + }; + + patches = [ + # this patch fixes the darwin build + # open_jtalk uses mecab, which uses the register keyword and std::binary_function, which are not allowed in c++17 + # this patch removes them + ./mecab-remove-deprecated.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools Date: Sun, 1 Sep 2024 11:38:13 +0200 Subject: [PATCH 10/24] voicevox: init at 0.20.0 --- pkgs/by-name/vo/voicevox/hardcode-paths.patch | 75 +++++++++++ pkgs/by-name/vo/voicevox/package.nix | 116 ++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox/hardcode-paths.patch create mode 100644 pkgs/by-name/vo/voicevox/package.nix diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch new file mode 100644 index 000000000000..844a3e5884c4 --- /dev/null +++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch @@ -0,0 +1,75 @@ +diff --git a/.env.production b/.env.production +index 5b0dcb0..5848ccd 100644 +--- a/.env.production ++++ b/.env.production +@@ -4,7 +4,7 @@ VITE_DEFAULT_ENGINE_INFOS=`[ + "uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d", + "name": "VOICEVOX Engine", + "executionEnabled": true, +- "executionFilePath": "vv-engine/run.exe", ++ "executionFilePath": "@voicevox_engine_path@", + "executionArgs": [], + "host": "http://127.0.0.1:50021" + } +diff --git a/electron-builder.config.js b/electron-builder.config.js +index 462e6f2..10a9bff 100644 +--- a/electron-builder.config.js ++++ b/electron-builder.config.js +@@ -35,19 +35,6 @@ const isMac = process.platform === "darwin"; + // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A + const extraFilePrefix = isMac ? "MacOS/" : ""; + +-const sevenZipFile = fs +- .readdirSync(path.resolve(__dirname, "build", "vendored", "7z")) +- .find( +- // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz +- (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName), +- ); +- +-if (!sevenZipFile) { +- throw new Error( +- "7z binary file not found. Run `node ./build/download7z.js` first.", +- ); +-} +- + /** @type {import("electron-builder").Configuration} */ + const builderOptions = { + beforeBuild: async () => { +@@ -88,14 +75,6 @@ const builderOptions = { + from: "build/README.txt", + to: extraFilePrefix + "README.txt", + }, +- { +- from: VOICEVOX_ENGINE_DIR, +- to: path.join(extraFilePrefix, "vv-engine"), +- }, +- { +- from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile), +- to: extraFilePrefix + sevenZipFile, +- }, + ], + // electron-builder installer + productName: "VOICEVOX", +diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts +index 6aa17b6..b8b52b7 100644 +--- a/src/backend/electron/manager/vvppManager.ts ++++ b/src/backend/electron/manager/vvppManager.ts +@@ -196,16 +196,8 @@ export class VvppManager { + + const args = ["x", "-o" + outputDir, archiveFile, "-t" + format]; + +- let sevenZipPath = import.meta.env.VITE_7Z_BIN_NAME; +- if (!sevenZipPath) { +- throw new Error("7z path is not defined"); +- } +- if (import.meta.env.PROD) { +- sevenZipPath = path.join( +- path.dirname(app.getPath("exe")), +- sevenZipPath, +- ); +- } ++ const sevenZipPath = `@sevenzip_path@`; ++ + log.log( + "Spawning 7z:", + sevenZipPath, diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix new file mode 100644 index 000000000000..e4935091c87b --- /dev/null +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -0,0 +1,116 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + replaceVars, + makeDesktopItem, + copyDesktopItems, + makeWrapper, + electron, + _7zz, + voicevox-engine, +}: + +buildNpmPackage rec { + pname = "voicevox"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox"; + rev = "refs/tags/${version}"; + hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI="; + }; + + patches = [ + (replaceVars ./hardcode-paths.patch { + sevenzip_path = lib.getExe _7zz; + voicevox_engine_path = lib.getExe voicevox-engine; + }) + ]; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "999.999.999" "${version}" \ + --replace-fail "postinstall" "_postinstall" + ''; + + npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g="; + + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # disable code signing on Darwin + env.CSC_IDENTITY_AUTO_DISCOVERY = "false"; + + buildPhase = '' + runHook preBuild + + # build command taken from the definition of the `electron:build` npm script + VITE_TARGET=electron npm exec vite build + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + npm exec electron-builder -- \ + --dir \ + --config electron-builder.config.js \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 public/icon.png $out/share/icons/hicolor/256x256/apps/voicevox.png + + mkdir -p $out/share/voicevox + cp -r dist_electron/*-unpacked/{locales,resources{,.pak}} $out/share/voicevox + + makeWrapper ${lib.getExe electron} $out/bin/voicevox \ + --add-flags $out/share/voicevox/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist_electron/mac*/VOICEVOX.app $out/Applications + makeWrapper $out/Applications/VOICEVOX.app/Contents/MacOS/VOICEVOX $out/bin/voicevox + ''} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "voicevox"; + exec = "voicevox"; + icon = "voicevox"; + desktopName = "VOICEVOX"; + categories = [ "AudioVideo" ]; + mimeTypes = [ "application/x-voicevox" ]; + }) + ]; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}"; + description = "Editor for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox"; + license = lib.licenses.lgpl3Only; + mainProgram = "voicevox"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = electron.meta.platforms; + }; +} From a597f4ffe151a7514f103fab2313b7c6fc220956 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 20 Dec 2024 18:26:11 +0100 Subject: [PATCH 11/24] glab: 1.50.0 -> 1.51.0 --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 767dcfa4a162..9f29550ee58b 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -8,16 +8,16 @@ buildGo123Module rec { pname = "glab"; - version = "1.50.0"; + version = "1.51.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WQO+9Fmlzj21UPJ9cdFc6JC8mbkzOWxz077JR+11BXA="; + hash = "sha256-EWcoEm6DbRT0PP2qYhdwDHCkbeAG6vDVATPhX9pPfiw="; }; - vendorHash = "sha256-nwHY0221nacHk4M+RKA8BEJLCoJJdIKwP0ZPjhYxc7Q="; + vendorHash = "sha256-f6qAFeB9kshtQ2AW6OnEGSnhJYlJ2gAGRDplVmQSVNA="; ldflags = [ "-s" From cee4574451bb015a5c4e5b3dcd3a1ab0d65a71f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:39:09 +0000 Subject: [PATCH 12/24] kanboard: 1.2.42 -> 1.2.43 --- pkgs/by-name/ka/kanboard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix index 82534fd5c902..63c917d4c559 100644 --- a/pkgs/by-name/ka/kanboard/package.nix +++ b/pkgs/by-name/ka/kanboard/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kanboard"; - version = "1.2.42"; + version = "1.2.43"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; + hash = "sha256-/PFE5h4elHFNbbIssoGMDkhGkEIec2uEMz+vU+DN5D0="; }; dontBuild = true; From 33286b8dca4b924701d7baf98fd64cacc1c9e476 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 21:25:36 +0100 Subject: [PATCH 13/24] dolibarr: 20.0.0 -> 20.0.2 Diff: https://github.com/Dolibarr/dolibarr/compare/20.0.0...20.0.2 Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/20.0.2 --- pkgs/by-name/do/dolibarr/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index 81660a85cf2f..0f29c24d99cb 100644 --- a/pkgs/by-name/do/dolibarr/package.nix +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "20.0.0"; + version = "20.0.2"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; - rev = version; - hash = "sha256-nxytzUEpEo1qeIlpbPQ4mETl5DAAP+d1bqUcYxEW26E="; + tag = version; + hash = "sha256-5OEZpBxTYXhO27ea/GBmJI9uDLRDgMNc9ehQ7mvvSrY="; }; dontBuild = true; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g' substituteInPlace htdocs/filefunc.inc.php \ - --replace '//$conffile = ' '$conffile = ' \ - --replace '//$conffiletoshow = ' '$conffiletoshow = ' + --replace-fail '//$conffile = ' '$conffile = ' \ + --replace-fail '//$conffiletoshow = ' '$conffiletoshow = ' substituteInPlace htdocs/install/inc.php \ - --replace '//$conffile = ' '$conffile = ' \ - --replace '//$conffiletoshow = ' '$conffiletoshow = ' + --replace-fail '//$conffile = ' '$conffile = ' \ + --replace-fail '//$conffiletoshow = ' '$conffiletoshow = ' ''; installPhase = '' @@ -38,10 +38,11 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) dolibarr; }; - meta = with lib; { + meta = { description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server"; + changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}"; homepage = "https://dolibarr.org/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } From 822fbb592e16d845818f45e3b5b6bce404983dd7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 21:27:52 +0100 Subject: [PATCH 14/24] dolibarr: add GaetanLepage as maintainer --- pkgs/by-name/do/dolibarr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index 0f29c24d99cb..c37380bf178f 100644 --- a/pkgs/by-name/do/dolibarr/package.nix +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}"; homepage = "https://dolibarr.org/"; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 41f7c189aa39ff0383c4317a79b93e48881a04d5 Mon Sep 17 00:00:00 2001 From: kmatas <33095685+kmatasfp@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:10:27 -0800 Subject: [PATCH 15/24] golem: 1.0.27 -> 1.1.0 code review improvements --- pkgs/by-name/go/golem/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index e2759207f853..a04ebeddbe60 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -20,13 +20,13 @@ }: rustPlatform.buildRustPackage rec { pname = "golem"; - version = "1.0.27"; + version = "1.1.0"; src = fetchFromGitHub { owner = "golemcloud"; repo = "golem"; tag = "v${version}"; - hash = "sha256-H8Dykn079107gZTV2w/T/gyIVxJtV8NuhuCM2+46yyI="; + hash = "sha256-6AUUgXWlDaoI16p/Hrl115XMGYUIDD5YWHX6JfDk9SI="; }; # Taker from https://github.com/golemcloud/golem/blob/v1.0.26/Makefile.toml#L399 @@ -53,13 +53,13 @@ rustPlatform.buildRustPackage rec { # Required for golem-wasm-rpc's build.rs to find the required protobuf files # https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7 - GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.0.1"; + GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.1.0"; # Required for golem-examples's build.rs to find the required Wasm Interface Type (WIT) files # https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9 - GOLEM_WIT_ROOT = "../golem-wit-1.0.3"; + GOLEM_WIT_ROOT = "../golem-wit-1.1.0"; useFetchCargoVendor = true; - cargoHash = "sha256-GrZhWcm7id8pRrwHRDt5k1tcVnoePO8eCWCHzkhCsZk="; + cargoHash = "sha256-zf/L7aNsfQXCdGpzvBZxgoatAGB92bvIuj59jANrXIc="; # Tests are failing in the sandbox because of some redis integration tests doCheck = false; @@ -78,9 +78,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Open source durable computing platform that makes it easy to build and deploy highly reliable distributed systems"; - changelog = "https://github.com/golemcloud/golem/releases/tag/v${version}"; + changelog = "https://github.com/golemcloud/golem/releases/tag/${src.tag}"; homepage = "https://www.golem.cloud/"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kmatasfp ]; mainProgram = "golem-cli"; }; } From 43eed30b66bee7523f5b907a72127d41a1afde50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:34:12 +0000 Subject: [PATCH 16/24] gh-dash: 4.7.3 -> 4.8.0 --- pkgs/by-name/gh/gh-dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 2e90cb565731..1a267b1ad1bc 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.7.3"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-QDqGsVgY3Je1VgQVobDhNkVjrCyvMNEdghXc0ny+yyo="; + hash = "sha256-0LiuEhp1caTdROBvkqEpI80y3s5zW3jIUTEKtY2OD0o="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; From 5d40d05b10072d949a42674d12b67518d830bb95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 02:01:50 +0000 Subject: [PATCH 17/24] process-compose: 1.40.1 -> 1.46.0 --- pkgs/by-name/pr/process-compose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index f75ac0b261de..e88658dcb0bb 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule rec { pname = "process-compose"; - version = "1.40.1"; + version = "1.46.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-/A/5tdALlb1ultEPTj6+EztjGc7PT9O7VyWey/EyLbQ="; + hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -45,7 +45,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-ekNISmU9TVi+YA2f3uJVyMsv8xkT8DmDUBw1ASqIfcY="; + vendorHash = "sha256-pztub6PsHhF56ks4UFG9u/mGrvKFUZi+7EudpP9DVYE="; doCheck = false; From df4ac83df16ac7298ed9137374d9cbf1c26fcdec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 03:14:40 +0000 Subject: [PATCH 18/24] raider: 3.0.1 -> 3.0.2 --- pkgs/by-name/ra/raider/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix index a99a8efefe07..81bff79d3c09 100644 --- a/pkgs/by-name/ra/raider/package.nix +++ b/pkgs/by-name/ra/raider/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "raider"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "ADBeveridge"; repo = "raider"; rev = "v${version}"; - hash = "sha256-LkGSEUoruWfEq/ttM3LkA/UjHc3ZrlvGF44HsJLntAo="; + hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ="; }; nativeBuildInputs = From 0ff97fc16f62fa65868665b88b977dfd5372e94d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 04:30:24 +0000 Subject: [PATCH 19/24] circt: 1.98.0 -> 1.99.1 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 042b90c6f51f..712113bdaa3a 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.98.0"; + version = "1.99.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-wkaspxwWJ7xJVQ+VZ9Z85zbzOcLAb3v55EJQjd+jiw8="; + hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro="; fetchSubmodules = true; }; From c6f03b62ff842cfdb2d04d569d8d2718654e2003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 07:49:45 +0000 Subject: [PATCH 20/24] s7: 11.2-unstable-2024-12-10 -> 11.2-unstable-2024-12-19 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 59823d1d2073..022c0ce15ab1 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.2-unstable-2024-12-10"; + version = "11.2-unstable-2024-12-19"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "9228fbb69835a8b414cba028d56ee7ddf4479e14"; - hash = "sha256-qvkkRc3UivsAAu9b48K+6dpl91MDnTsU/zyN4hfKUCo="; + rev = "a5515d455f5aca49d5275a5a35ac88935f3ad401"; + hash = "sha256-Ik3edzpO9hIhJBZHyzL/CsTVKGbDdGVfE9pNrBeSjp8="; }; buildInputs = [ From e443609d45438a601d7a28fd14d472ca5301538f Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 11 Dec 2024 09:58:07 +0300 Subject: [PATCH 21/24] opener: init at 0.1.5 opener: update meta opener: update src and add passthru script opener: add env.VERSION opener: update --- pkgs/by-name/op/opener/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/op/opener/package.nix diff --git a/pkgs/by-name/op/opener/package.nix b/pkgs/by-name/op/opener/package.nix new file mode 100644 index 000000000000..bc51a1e6062f --- /dev/null +++ b/pkgs/by-name/op/opener/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "opener"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "superbrothers"; + repo = "opener"; + tag = "v${version}"; + hash = "sha256-pp2jn4J6gYyZky5rVBaai9sVVqvPgM+fGryseM58WEI="; + }; + + vendorHash = "sha256-xwMRWEwrG12QevVVTMC9OTdjIBoxR1AHkoa6OErPpF4="; + + postPatch = '' + substituteInPlace opener.go \ + --replace-fail \ + 'var version string' \ + 'var version string = "${version}"' + ''; + + __darwinAllowLocalNetworking = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Open URL in your local web browser from the SSH-connected remote environment"; + homepage = "https://github.com/superbrothers/opener"; + changelog = "https://github.com/superbrothers/opener/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "opener"; + }; +} From 17a3028c12b5368f20f2487f81bc923d76f83575 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Dec 2024 09:11:06 +0100 Subject: [PATCH 22/24] typstyle: 0.12.12 -> 0.12.13 Diff: https://github.com/Enter-tainer/typstyle/compare/None...v0.12.13 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.12.13/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index c7f9368ff297..6cc812c52020 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.12"; + version = "0.12.13"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${version}"; - hash = "sha256-oQnZm+BkccHN3xXSe1yBus3m4JKyCBKM9kkJz+QryR0="; + hash = "sha256-mEpMKXN07qjQ+qQSSTKVKss0c/x4bm0K5WcwLTjdejs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pbsB9mQafgI6PudjeCzOSpk3+iZkkdp/V1zgH8pP7us="; + cargoHash = "sha256-1NZmLH845oXb/IVQzwSv9hqoUGR5ZuGtsk4SCn/s2kk="; # Disabling tests requiring network access checkFlags = [ From 63d59f32e7ead6c020a18acab1e8f33a7940c21b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 21 Dec 2024 10:30:10 +0200 Subject: [PATCH 23/24] warp-terminal: 0.2024.12.10.15.55.stable_04 -> 0.2024.12.18.08.02.stable_03 (#366843) --- pkgs/by-name/wa/warp-terminal/package.nix | 2 ++ pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 41d4a1cbe2e6..7aebef84c432 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -6,6 +6,7 @@ autoPatchelfHook, undmg, zstd, + alsa-lib, curl, fontconfig, libglvnd, @@ -48,6 +49,7 @@ let ]; buildInputs = [ + alsa-lib # libasound.so.2 curl fontconfig (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 11b48e1fd5a4..bc2650a06601 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-NK9/YhnEWdoxF8fkGJvYVFCsNh0XPSheXbw89wNkaio=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-CrRt7fLoZ9LR3fD7xXBzlRFf4CAjQjokU5UaHNJnVNA=", + "version": "0.2024.12.18.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-wAzPAaigjaHl5JhuS92rkHXLZRAQtq7p8IB67sqPDlY=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-0A9EPkDp77tpfrRuXV2rVPaXMYbY7erbKBd6IT9CTFQ=", + "version": "0.2024.12.18.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-GbirEK2Jhfunj9ORWp5uW/QHUzSnJRQRh1ezApr1p00=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-IlqpK8IbtSMKGNspKj2Rq2Jzlyc7RYcfRaoYY9Akhdk=", + "version": "0.2024.12.18.08.02.stable_03" } } From 115df1c2cf0f7ada4bbf0311fc452975df69b113 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 2 Dec 2024 05:50:02 +0100 Subject: [PATCH 24/24] glab: use nix-update-script --- pkgs/by-name/gl/glab/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 9f29550ee58b..365067dd98a9 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -4,6 +4,7 @@ fetchFromGitLab, installShellFiles, stdenv, + nix-update-script, }: buildGo123Module rec { @@ -43,6 +44,8 @@ buildGo123Module rec { --zsh <($out/bin/glab completion -s zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "GitLab CLI tool bringing GitLab to your command line"; license = lib.licenses.mit;