From a3d4328fb77178fb7c9ea8e9522e7c55f34d7a76 Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Fri, 22 Mar 2024 00:51:12 +0100 Subject: [PATCH 01/45] python311Packages.kornia-rs: init at 0.1.2 --- .../python-modules/kornia-rs/Cargo.lock | 1598 +++++++++++++++++ .../python-modules/kornia-rs/default.nix | 56 + .../kornia-rs/kornia-rs-from-crates.patch | 12 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 1668 insertions(+) create mode 100644 pkgs/development/python-modules/kornia-rs/Cargo.lock create mode 100644 pkgs/development/python-modules/kornia-rs/default.nix create mode 100644 pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch diff --git a/pkgs/development/python-modules/kornia-rs/Cargo.lock b/pkgs/development/python-modules/kornia-rs/Cargo.lock new file mode 100644 index 000000000000..ce16e71e914b --- /dev/null +++ b/pkgs/development/python-modules/kornia-rs/Cargo.lock @@ -0,0 +1,1598 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "arbitrary" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "serde", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitstream-io" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e445576659fd04a57b44cbd00aa37aaa815ebefa0aa3cb677a6b5e63d883074f" + +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + +[[package]] +name = "built" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +dependencies = [ + "cargo-lock", +] + +[[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cargo-lock" +version = "8.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +dependencies = [ + "semver", + "serde", + "toml 0.5.11", + "url", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast_image_resize" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d450fac8a334ad72825596173f0f7767ff04dd6e3d59c49c894c4bc2957e8b" +dependencies = [ + "cfg-if", + "num-traits", + "thiserror", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6107a25f04af48ceeb4093eebc9b405ee5a1813a0bab5ecf1805d3eabb3337" +dependencies = [ + "byteorder", + "thiserror", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[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 = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kornia-py" +version = "0.1.2" +dependencies = [ + "anyhow", + "kornia-rs", + "numpy", + "pyo3", +] + +[[package]] +name = "kornia-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feee33cc9f9cbe8b17bd9d2151b1bb10a2b61585d961899d4d3164a30bcb08b9" +dependencies = [ + "anyhow", + "fast_image_resize", + "image", + "memmap2", + "ndarray", + "num-traits", + "turbojpeg", +] + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libfuzzer-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf184a4b6b274f82a5df6b357da6055d3e82272327bba281c28bbba6f1664ef" +dependencies = [ + "arbitrary 0.4.7", + "cc", +] + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary 1.3.2", + "cc", + "once_cell", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", + "rayon", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[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 = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "numpy" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" +dependencies = [ + "libc", + "ndarray", + "num-complex", + "num-integer", + "num-traits", + "pyo3", + "rustc-hash", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pyo3" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +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 = "rav1e" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1" +dependencies = [ + "arbitrary 0.4.7", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io 1.10.0", + "built 0.5.2", + "cfg-if", + "interpolate_name", + "itertools 0.10.5", + "libc", + "libfuzzer-sys 0.3.5", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.3.3", + "num-traits", + "once_cell", + "paste", + "rand", + "rand_chacha", + "rust_hawktracer", + "rustc_version", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary 1.3.2", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io 2.2.0", + "built 0.7.1", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys 0.4.7", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.4.2", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", +] + +[[package]] +name = "ravif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d44feba0b8a381a5efa2c0baf8dace8418904403260233f4a614503b018fc288" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e 0.6.6", + "rav1e 0.7.1", + "rayon", + "rgb", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rust_hawktracer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3480a29b927f66c6e06527be7f49ef4d291a01d694ec1fe85b0de71d6b02ac1" +dependencies = [ + "rust_hawktracer_normal_macro", + "rust_hawktracer_proc_macro", +] + +[[package]] +name = "rust_hawktracer_normal_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a570059949e1dcdc6f35228fa389f54c2c84dfe0c94c05022baacd56eacd2e9" + +[[package]] +name = "rust_hawktracer_proc_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb626abdbed5e93f031baae60d72032f56bc964e11ac2ff65f2ba3ed98d6d3e1" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.10", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "turbojpeg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5080f5adaa92c82bf84f825dd092e9692c923ee652f1634835e9a1f372518d" +dependencies = [ + "libc", + "thiserror", + "turbojpeg-sys", +] + +[[package]] +name = "turbojpeg-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa6daade3b979fb7454cce5ebcb9772ce7a1cf476ea27ed20ed06e13d9bc983" +dependencies = [ + "anyhow", + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix new file mode 100644 index 000000000000..57aaa325d2b6 --- /dev/null +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, cmake +, nasm +, substituteAll +}: + +buildPythonPackage rec { + pname = "kornia-rs"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kornia"; + repo = "kornia-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-7toCMaHzFAzm6gThVLBxKLgQVgFJatdJseDlfdeS8RE="; + }; + + nativeBuildInputs = [ + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + cmake # Only for dependencies. + nasm # Only for dependencies. + ]; + + cargoRoot = "py-kornia"; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + # The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead. + patches = [ + (substituteAll { + src = ./kornia-rs-from-crates.patch; + inherit version; + }) + ]; + + prePatch = '' + cp ${./Cargo.lock} py-kornia/Cargo.lock + ''; + + maturinBuildFlags = [ "-m" "py-kornia/Cargo.toml" ]; + + dontUseCmakeConfigure = true; # We only want to use CMake to build some Rust dependencies. + + meta = with lib; { + homepage = "https://github.com/kornia/kornia-rs"; + description = "Python bindings to Low-level Computer Vision library in Rust"; + license = licenses.asl20; + maintainers = with maintainers; [ chpatrick ]; + }; +} diff --git a/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch b/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch new file mode 100644 index 000000000000..4745f9ab9f06 --- /dev/null +++ b/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch @@ -0,0 +1,12 @@ +diff --git a/py-kornia/Cargo.toml b/py-kornia/Cargo.toml +index e0563f3..e192654 100644 +--- a/py-kornia/Cargo.toml ++++ b/py-kornia/Cargo.toml +@@ -9,6 +9,6 @@ crate-type = ["cdylib"] + + [dependencies] + anyhow = "1.0.80" +-kornia-rs = { path = ".." } ++kornia-rs = { version = "@version@" } + pyo3 = { version = "0.20", features = ["extension-module"] } + numpy = { version = "0.20.0" } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f33225e8e8eb..28c893cf64c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6380,6 +6380,8 @@ self: super: with self; { kornia = callPackage ../development/python-modules/kornia { }; + kornia-rs = callPackage ../development/python-modules/kornia-rs { }; + krakenex = callPackage ../development/python-modules/krakenex { }; krfzf-py = callPackage ../development/python-modules/krfzf-py { }; From a5ed5b19baa8988cf08947adda40d6bd2f2baba1 Mon Sep 17 00:00:00 2001 From: Patrick Chilton Date: Fri, 22 Mar 2024 00:51:33 +0100 Subject: [PATCH 02/45] python311Packages.kornia: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/kornia/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index a00b3d6487d3..0663cfecea0c 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -4,11 +4,12 @@ , pythonOlder , packaging , torch +, kornia-rs }: buildPythonPackage rec { pname = "kornia"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,10 +18,11 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gHMrA4Uzazpw4TdswrXdoZG4+ek5g+wtLXNmhH3SlOM="; + hash = "sha256-DmXttvKoLqny0mt3SUonidNxDkNX7N0LdTxy/H32R/4="; }; propagatedBuildInputs = [ + kornia-rs packaging torch ]; @@ -39,7 +41,6 @@ buildPythonPackage rec { "kornia.metrics" "kornia.morphology" "kornia.tracking" - "kornia.testing" "kornia.utils" ]; From e4f708443f99005c41f67f4bcecb06f1c712098d Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 25 Apr 2024 11:10:44 -0700 Subject: [PATCH 03/45] python311Packages.openai: 1.23.2 -> 1.23.6 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.23.2...v1.23.6 Changelog: https://github.com/openai/openai-python/releases/tag/v1.23.6 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 8d9d06b05311..a2720bfb8567 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.23.2"; + version = "1.23.6"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ScBD+g+xbbZOdIip4ISXYug9MqKLahutUNIoQnD1tHc="; + hash = "sha256-b7LkZc8XGNOG0HHStlFikatKWQ5gob98XLsei/vOq4c="; }; build-system = [ From 92c806336606a082c187a279acdbdcc4724068f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Apr 2024 06:27:12 +0000 Subject: [PATCH 04/45] python311Packages.recipe-scrapers: 14.55.0 -> 14.56.0 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 70a852bfb1a0..4c9ad2d8295e 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.55.0"; + version = "14.56.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-HjR4Lwlcrpeqv6BXI+aYCL9e7ZTaTa522z0lSW03wW0="; + hash = "sha256-+9oQLCuR+rRCG5tnyofHd8WMkQ5QPsWfLCnwIDU5d9o="; }; nativeBuildInputs = [ From 3b73a4b5f7f72336b72c32e02ec5df460d693e12 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 27 Apr 2024 09:20:17 -0500 Subject: [PATCH 05/45] nzbget: 23.0 -> 24.0 --- pkgs/tools/networking/nzbget/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 574045aaa10b..c1eff0920f0b 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -19,23 +19,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "23.0"; + version = "24.0"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-JqC82zpsIqRYB7128gTSOQMWJFR/t63NJXlPgGqP0jE="; + hash = "sha256-vEtbf4y3Jc69FrEzGE34Xt/4oDmZlWTbwispvoypRI0="; }; - patches = [ - # add nzbget-ng patch not in nzbgetcom for buffer overflow issue -- see https://github.com/nzbget-ng/nzbget/pull/43 - (fetchpatch { - url = "https://github.com/nzbget-ng/nzbget/commit/8fbbbfb40003c6f32379a562ce1d12515e61e93e.patch"; - hash = "sha256-mgI/twEoMTFMFGfH1/Jm6mE9u9/CE6RwELCSGx5erUo="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ From 95c1ffd998b90138a4910076d22e03aa6d69d52c Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 27 Apr 2024 22:27:31 +0200 Subject: [PATCH 06/45] chromedriver: 123.0.6312.122 -> 124.0.6367.91 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 76825427b895..5acd8c1a96df 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk="; + hash_darwin = "sha256-RGOChK4JhrFUgVY/5YqgE0KFLRl6a7X2llw1ZfhiPXY="; hash_darwin_aarch64 = - "sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4="; - hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y="; - version = "123.0.6312.122"; + "sha256-K1jFXmWtXrS43UJg2mQ39Kae6tv7E9Fxm6LUWg+uwLo="; + hash_linux = "sha256-xwaRNh7sllyNaq8+aLAZDQ3uDg06cu3KYqc02LWPSyw="; + version = "124.0.6367.91"; }; deps = { gn = { From 5072c7bb91802e6c0b8492a01b757771b161071d Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 27 Apr 2024 22:34:15 +0200 Subject: [PATCH 07/45] chromium: 124.0.6367.60 -> 124.0.6367.91 Note that there's currently no release blog entry for .91 specifically. https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_24.html This update includes 4 security fixes. CVEs: CVE-2024-4058 CVE-2024-4059 CVE-2024-4060 --- .../networking/browsers/chromium/upstream-info.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5acd8c1a96df..31f8fe214527 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2024-03-14"; }; }; - hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog="; - hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI="; - version = "124.0.6367.60"; + hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; + hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; + version = "124.0.6367.91"; }; ungoogled-chromium = { deps = { From 48f25ebe728c551bfb3bbafb237a28ecfda67bdc Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 27 Apr 2024 22:35:39 +0200 Subject: [PATCH 08/45] ungoogled-chromium: 124.0.6367.60-1 -> 124.0.6367.91-1 Note that there's currently no release blog entry for .91 specifically. https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_24.html This update includes 4 security fixes. CVEs: CVE-2024-4058 CVE-2024-4059 CVE-2024-4060 --- .../networking/browsers/chromium/upstream-info.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 31f8fe214527..c3ef4848ee44 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -28,12 +28,12 @@ version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-zgkt0stU/H5Mji429tigVbjOq27Op8UppHTjG6neoeA="; - rev = "124.0.6367.60-1"; + hash = "sha256-1/J3BhUlef8CH/jZ5P5fWGXnWxTiuB0Ep+AWrMrv9cE="; + rev = "124.0.6367.91-1"; }; }; - hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog="; - hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI="; - version = "124.0.6367.60"; + hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; + hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; + version = "124.0.6367.91"; }; } From 3f77d4164fe725efac196bfc9cde987c212f9184 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 23:32:55 +0000 Subject: [PATCH 09/45] gzdoom: 4.11.3 -> 4.12.1 --- pkgs/games/doom-ports/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index d063393210c4..2800e770ba0e 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.11.3"; + version = "4.12.1"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748="; + hash = "sha256-ityjfxlazt/R9vD+azVGr+w7Sdjlbh+ekbJexkPSF1g="; }; outputs = [ "out" "doc" ]; From dd7a10fac877d605b1cc91d3f3e94471d180622a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 14:48:33 +0000 Subject: [PATCH 10/45] palemoon-bin: 33.0.2 -> 33.1.0 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 0d268502b14f..9b3ea171b4f5 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.0.2"; + version = "33.1.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48="; + hash = "sha256-qjztSvNL7KNFG3sszgk5qH77do0HFQ8YTrgjFi2ZM00="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY="; + hash = "sha256-q4zAmnCN9SHGb8PthjAx7d5FKq/oAQ8c0R+U1SWqjAA="; }; }; From 9d39bb6cddfc879e19435885bbc583948e64f074 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 28 Apr 2024 17:25:42 +0200 Subject: [PATCH 11/45] python311Packages.pymc: fix setuptools --- pkgs/development/python-modules/pymc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 16aa22cf7fff..f8b3e637e0f1 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -10,6 +10,7 @@ , pythonOlder , scipy , typing-extensions +, setuptools }: buildPythonPackage rec { @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; }; + build-system = [ + setuptools + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail ', "pytest-cov"' "" From 6f6cfd54eaa2f84ddd82d44da9900a0056338b84 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 28 Apr 2024 16:18:50 +0200 Subject: [PATCH 12/45] dell-command-configure: fix self inclusive src --- pkgs/tools/system/dell-command-configure/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/dell-command-configure/default.nix b/pkgs/tools/system/dell-command-configure/default.nix index b4cd7e5dbf63..cd313751c7b6 100644 --- a/pkgs/tools/system/dell-command-configure/default.nix +++ b/pkgs/tools/system/dell-command-configure/default.nix @@ -55,10 +55,11 @@ let pname = "dell-command-configure-unpacked-wrapper-lib"; inherit version; - src = ./.; + unpackPhase = '' + cp ${./wrapper-lib.c} wrapper-lib.c + ''; postPatch = '' - ls -al substitute wrapper-lib.c lib.c \ --subst-var-by to "${unpacked}/srvadmin-hapi/opt/dell/srvadmin/etc/omreg.d/omreg-hapi.cfg" cc -fPIC -shared lib.c -o ${wrapperLibName} From bd62c41a667ec10f799acfeddfee14ab07dfe9b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:40:40 +0200 Subject: [PATCH 13/45] Revert "dvc: 3.50.0 -> 3.50.1" This reverts commit 124fc242c15349850743dde1255a5c53734c7132. --- pkgs/development/python-modules/dvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 47c07b911e60..f9190e727a1d 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.50.1"; + version = "3.50.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -67,7 +67,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-sY4iU2YdljgpWQXwL8sE424ft0LDjcKf0Q2xZeyv4xs="; + hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0="; }; pythonRelaxDeps = [ From 4d7b8fffd7e0a05801a163d18446a87dfda2aecb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:41:20 +0200 Subject: [PATCH 14/45] Revert "python311Packages.dvclive: format with nixfmt" This reverts commit ab6032f43a4fa031b81e9d7c10d4128feb6a6da5. --- .../python-modules/dvclive/default.nix | 101 +++++++++++------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 33adbdf07a08..fd78c6ca873d 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -1,34 +1,33 @@ -{ - lib, - buildPythonPackage, - datasets, - dvc, - dvc-render, - dvc-studio-client, - fastai, - fetchFromGitHub, - funcy, - gto, - jsonargparse, - lightgbm, - lightning, - matplotlib, - mmcv, - numpy, - optuna, - pandas, - pillow, - psutil, - pynvml, - pythonOlder, - ruamel-yaml, - scikit-learn, - scmrepo, - setuptools-scm, - tensorflow, - torch, - transformers, - xgboost, +{ lib +, buildPythonPackage +, datasets +, dvc +, dvc-render +, dvc-studio-client +, fastai +, fetchFromGitHub +, funcy +, gto +, jsonargparse +, lightgbm +, lightning +, matplotlib +, mmcv +, numpy +, optuna +, pandas +, pillow +, psutil +, pynvml +, pythonOlder +, ruamel-yaml +, scikit-learn +, scmrepo +, setuptools-scm +, tensorflow +, torch +, transformers +, xgboost }: buildPythonPackage rec { @@ -45,7 +44,9 @@ buildPythonPackage rec { hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; dependencies = [ dvc @@ -80,17 +81,29 @@ buildPythonPackage rec { numpy pillow ]; - sklearn = [ scikit-learn ]; + sklearn = [ + scikit-learn + ]; plots = [ pandas scikit-learn numpy ]; - markdown = [ matplotlib ]; - mmcv = [ mmcv ]; - tf = [ tensorflow ]; - xgb = [ xgboost ]; - lgbm = [ lightgbm ]; + markdown = [ + matplotlib + ]; + mmcv = [ + mmcv + ]; + tf = [ + tensorflow + ]; + xgb = [ + xgboost + ]; + lgbm = [ + lightgbm + ]; huggingface = [ datasets transformers @@ -98,19 +111,25 @@ buildPythonPackage rec { # catalyst = [ # catalyst # ]; - fastai = [ fastai ]; + fastai = [ + fastai + ]; lightning = [ lightning torch jsonargparse ] ++ jsonargparse.optional-dependencies.signatures; - optuna = [ optuna ]; + optuna = [ + optuna + ]; }; # Circular dependency with dvc doCheck = false; - pythonImportsCheck = [ "dvclive" ]; + pythonImportsCheck = [ + "dvclive" + ]; meta = with lib; { description = "Library for logging machine learning metrics and other metadata in simple file formats"; From 9b47f7cf0ac3c1eb32f6a5283e1eac2856dfe051 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:41:38 +0200 Subject: [PATCH 15/45] Revert "python311Packages.dvclive: 3.45.0 -> 3.46.0" This reverts commit d7ab5cd0c4366b78a347cd4ff6c04fe000c2a4fc. --- pkgs/development/python-modules/dvclive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index fd78c6ca873d..7090433431a9 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.46.0"; + version = "3.45.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvclive"; rev = "refs/tags/${version}"; - hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk="; + hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI="; }; build-system = [ From a0dc0759dad575908a2b122c9ae1e1e8d0906f3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:41:51 +0200 Subject: [PATCH 16/45] Revert "python312Packages.scmrepo: format with nixfmt" This reverts commit 596f33317f5de2dd690853e5f8dcc70ca0626769. --- .../python-modules/scmrepo/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 0c8de7e546bf..fc748ef6eca0 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -1,21 +1,20 @@ -{ - lib, - asyncssh, - buildPythonPackage, - dulwich, - dvc-http, - dvc-objects, - fetchFromGitHub, - fsspec, - funcy, - gitpython, - pathspec, - pygit2, - pygtrie, - pythonOlder, - setuptools, - setuptools-scm, - shortuuid, +{ lib +, asyncssh +, buildPythonPackage +, dulwich +, dvc-http +, dvc-objects +, fetchFromGitHub +, fsspec +, funcy +, gitpython +, pathspec +, pygit2 +, pygtrie +, pythonOlder +, setuptools +, setuptools-scm +, shortuuid }: buildPythonPackage rec { @@ -54,7 +53,9 @@ buildPythonPackage rec { # Requires a running Docker instance doCheck = false; - pythonImportsCheck = [ "scmrepo" ]; + pythonImportsCheck = [ + "scmrepo" + ]; meta = with lib; { description = "SCM wrapper and fsspec filesystem"; From 1229c8c08738a7f08d94eda8abb0453f7f9d7e72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:42:10 +0200 Subject: [PATCH 17/45] Revert "python312Packages.scmrepo: 3.3.1 -> 3.3.2" This reverts commit 202686c284e7596bc9b8a153da599adc7e3a5b2a. --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index fc748ef6eca0..e902cac51101 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.2"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-8lKiJCvER4Vg6L11WAykmgg37LWiYMsswS38Dtmb2Rc="; + hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE="; }; build-system = [ From 31721067f4efb6260a1ac77452646e1a5abce69e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:42:22 +0200 Subject: [PATCH 18/45] Revert "python312Packages.dulwich: forma twith nixfmt" This reverts commit c220a30c605861a6087f32bcaf1e75f9aed6dfb4. --- .../python-modules/dulwich/default.nix | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 5ce01aaad1b5..90d69cbc0a9d 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,23 +1,22 @@ -{ - lib, - stdenv, - buildPythonPackage, - certifi, - fastimport, - fetchFromGitHub, - gevent, - geventhttpclient, - git, - glibcLocales, - gnupg, - gpgme, - paramiko, - pytest-xdist, - pytestCheckHook, - pythonOlder, - setuptools, - setuptools-rust, - urllib3, +{ lib +, stdenv +, buildPythonPackage +, certifi +, fastimport +, fetchFromGitHub +, gevent +, geventhttpclient +, git +, glibcLocales +, gnupg +, gpgme +, paramiko +, pytest-xdist +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-rust +, urllib3 }: buildPythonPackage rec { @@ -45,12 +44,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - fastimport = [ fastimport ]; + fastimport = [ + fastimport + ]; pgp = [ gpgme gnupg ]; - paramiko = [ paramiko ]; + paramiko = [ + paramiko + ]; }; nativeCheckInputs = [ @@ -71,7 +74,9 @@ buildPythonPackage rec { "tests/test_greenthreads.py" ]; - pythonImportsCheck = [ "dulwich" ]; + pythonImportsCheck = [ + "dulwich" + ]; meta = with lib; { description = "Implementation of the Git file formats and protocols"; @@ -81,10 +86,7 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ - asl20 - gpl2Plus - ]; + license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; } From 448512cca0b9e03273bbd0e050fa1195a00e8de5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:46:38 +0200 Subject: [PATCH 19/45] Revert "python312Packages.dulwich: 0.21.7 -> 0.22.1" This reverts commit 82d7a8b959a101dc9cc873b6aba3cfe45101f692. --- .../python-modules/dulwich/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 90d69cbc0a9d..7e7e6fe10b9d 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "dulwich"; - version = "0.22.1"; + version = "0.21.7"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jelmer"; repo = "dulwich"; rev = "refs/tags/${pname}-${version}"; - hash = "sha256-bf3ZUMX4afpdTBpFnx0HMyzCNG6V/p4eOl36djxGbtk="; + hash = "sha256-iP+6KtaQ8tfOobovSLSJZogS/XWW0LuHgE2oV8uQW/8="; }; build-system = [ @@ -63,15 +63,26 @@ buildPythonPackage rec { glibcLocales pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ passthru.optional-dependencies.fastimport + ++ passthru.optional-dependencies.pgp + ++ passthru.optional-dependencies.paramiko; doCheck = !stdenv.isDarwin; + disabledTests = [ + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' + "test_no_decode_encode" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' + "test_cyrillic" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' + "test_commit_no_encode_decode" + ]; + disabledTestPaths = [ - # Missing test inputs - "tests/contrib/test_swift_smoke.py" - # Import issue - "tests/test_greenthreads.py" + # missing test inputs + "dulwich/contrib/test_swift_smoke.py" + # flaky on high core count >4 + "dulwich/tests/compat/test_client.py" ]; pythonImportsCheck = [ From c3882e3a6bd8d3fb6a0f6f6c2be02432af9024a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:47:30 +0200 Subject: [PATCH 20/45] Revert "python312Packages.dulwich: refactor" This reverts commit 5cef65b22d9e6434997ca5bcccf55c06c40d3f9d. --- pkgs/development/python-modules/dulwich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 7e7e6fe10b9d..49789421af34 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -20,9 +20,9 @@ }: buildPythonPackage rec { - pname = "dulwich"; version = "0.21.7"; - pyproject = true; + pname = "dulwich"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { setuptools-rust ]; - dependencies = [ + propagatedBuildInputs = [ certifi urllib3 ]; From 9051eb7100c8eeda0696c3ee6b228402c4d08c11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 18:58:53 +0200 Subject: [PATCH 21/45] flexget: 3.11.29 -> 3.11.30 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.29...v3.11.30 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.30 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f2d45faae812..66947266d202 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.29"; + version = "3.11.30"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-rtLn3QkcVwCh2DfJmtkKvZQcFL/zlZCh7VTUpWtQErw="; + hash = "sha256-msvNZ3kE48dNnhtUWLGxulb2iZ78hhyg7fVL2OSOdyY="; }; postPatch = '' From 3b58f760f6ba7de2c488815e7cee38033e7fedc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 19:45:37 +0200 Subject: [PATCH 22/45] Revert "python312Packages.msgraph-sdk: 1.2.0 -> 1.3.0" --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 93b3b99acc32..7dc4e3fd062f 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.3.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RdjACxEB4w1Sbdf8lPHd12XcEMXBqaa84mF9XvavyHo="; + hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; }; build-system = [ setuptools ]; From c3049215730ee25597cf502f4729b5155462eadd Mon Sep 17 00:00:00 2001 From: Sebastian Johansson Date: Sun, 28 Apr 2024 19:47:04 +0200 Subject: [PATCH 23/45] Remove self from maintainer list --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 103b15e37926..f6cd5a966c1c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3546,12 +3546,6 @@ githubId = 1118859; name = "Scott Worley"; }; - ChlorideCull = { - email = "nixrelated@chcl.se"; - github = "ChlorideCull"; - githubId = 4977063; - name = "Sebastian Johansson"; - }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; From 20d28dbcb3601903e377ccb28a6a145810017a97 Mon Sep 17 00:00:00 2001 From: Sebastian Johansson Date: Sun, 28 Apr 2024 19:48:36 +0200 Subject: [PATCH 24/45] lprint: remove self from maintainer list --- pkgs/by-name/lp/lprint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix index 26167ccb0d6c..deefd68a73b4 100644 --- a/pkgs/by-name/lp/lprint/package.nix +++ b/pkgs/by-name/lp/lprint/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/lprint"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ChlorideCull ]; + maintainers = with maintainers; [ ]; }; } From 4260e18e67eb83fe8e5b0b9210e67f4676591a5d Mon Sep 17 00:00:00 2001 From: Sebastian Johansson Date: Sun, 28 Apr 2024 19:50:22 +0200 Subject: [PATCH 25/45] pappl: remove self from maintainers --- pkgs/applications/printing/pappl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 821944387eff..b49cc1b43231 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ jonringer ChlorideCull ]; + maintainers = with maintainers; [ jonringer ]; }; } From a09b74190d9d26dcb2ced213d2f320ef12f9bb08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 19:52:16 +0200 Subject: [PATCH 26/45] python312Packages.aiocsv: 1.3.1 -> 1.3.2 Diff: https://github.com/MKuranowski/aiocsv/compare/refs/tags/v1.3.1...v1.3.2 --- pkgs/development/python-modules/aiocsv/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 30511eb81676..5dd28b251aaa 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -7,11 +7,12 @@ , pytestCheckHook , pythonOlder , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "aiocsv"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "MKuranowski"; repo = "aiocsv"; rev = "refs/tags/v${version}"; - hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4="; + hash = "sha256-NnRLBXvQj25dSHc8ZnUaPT8Oiy2EyHLIb8IJPQliyPg="; }; nativeBuildInputs = [ @@ -28,6 +29,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = [ + typing-extensions + ]; + nativeCheckInputs = [ aiofiles pytest-asyncio From 12a956773bf7b333c9be99fa12da53fbdc135c58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 19:53:12 +0200 Subject: [PATCH 27/45] python312Packages.aiocsv: refactor --- pkgs/development/python-modules/aiocsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 5dd28b251aaa..86455fe36d76 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { hash = "sha256-NnRLBXvQj25dSHc8ZnUaPT8Oiy2EyHLIb8IJPQliyPg="; }; - nativeBuildInputs = [ + build-system = [ cython setuptools ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions ]; From d2899e6e1e407b738cd2ea9bfd5c744e74576f1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 19:53:33 +0200 Subject: [PATCH 28/45] python312Packages.aiocsv: format with nixfmt --- .../python-modules/aiocsv/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 86455fe36d76..f4697daee6c8 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -1,13 +1,14 @@ -{ lib -, aiofiles -, buildPythonPackage -, cython -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, typing-extensions +{ + lib, + aiofiles, + buildPythonPackage, + cython, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ - typing-extensions - ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ aiofiles @@ -43,9 +42,7 @@ buildPythonPackage rec { export CYTHONIZE=1 ''; - pythonImportsCheck = [ - "aiocsv" - ]; + pythonImportsCheck = [ "aiocsv" ]; disabledTestPaths = [ # Import issue From 14d4d773815af666b2260383bb2913d12694ca89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:00:25 +0200 Subject: [PATCH 29/45] python312Packages.aiogram: 3.4.1 -> 3.5.0 Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.4.1...v3.5.0 Changelog: https://github.com/aiogram/aiogram/releases/tag/v3.5.0 --- pkgs/development/python-modules/aiogram/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index ed60684b9fa3..b3be6e4e17b9 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.4.1"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-2of4KHdpAATOt0dCqI3AmTJtdeN5SdiWydeGjtagABI="; + hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" "-W" "ignore::pytest.PytestDeprecationWarning" + "-W" "ignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; From b2559571414a7c41f883ba0316520950005e47cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:01:30 +0200 Subject: [PATCH 30/45] python312Packages.aiogram: refactor --- .../python-modules/aiogram/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index b3be6e4e17b9..04d415ca3d76 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -1,25 +1,25 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, pytestCheckHook +, aiofiles , aiohttp , aiohttp-socks -, aiofiles , aresponses , babel +, buildPythonPackage , certifi +, fetchFromGitHub +, gitUpdater +, hatchling , magic-filter , pycryptodomex +, pydantic , pytest-aiohttp , pytest-asyncio , pytest-lazy-fixture -, redis -, hatchling -, pydantic +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pytz -, gitUpdater +, redis }: buildPythonPackage rec { @@ -36,8 +36,11 @@ buildPythonPackage rec { hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; - nativeBuildInputs = [ + build-system = [ hatchling + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -45,7 +48,7 @@ buildPythonPackage rec { "pydantic" ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp babel From 6387603e093b9ce19c56ab2f0e276faea5f9627b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:02:04 +0200 Subject: [PATCH 31/45] python312Packages.aiogram: format with nixfmt --- .../python-modules/aiogram/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 04d415ca3d76..74d9f070a721 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -1,25 +1,26 @@ -{ lib -, aiofiles -, aiohttp -, aiohttp-socks -, aresponses -, babel -, buildPythonPackage -, certifi -, fetchFromGitHub -, gitUpdater -, hatchling -, magic-filter -, pycryptodomex -, pydantic -, pytest-aiohttp -, pytest-asyncio -, pytest-lazy-fixture -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, redis +{ + lib, + aiofiles, + aiohttp, + aiohttp-socks, + aresponses, + babel, + buildPythonPackage, + certifi, + fetchFromGitHub, + gitUpdater, + hatchling, + magic-filter, + pycryptodomex, + pydantic, + pytest-aiohttp, + pytest-asyncio, + pytest-lazy-fixture, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + redis, }: buildPythonPackage rec { @@ -36,17 +37,11 @@ buildPythonPackage rec { hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "pydantic" - ]; + pythonRelaxDeps = [ "pydantic" ]; dependencies = [ aiofiles @@ -70,16 +65,17 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" - "-W" "ignore::pytest.PytestDeprecationWarning" - "-W" "ignore::DeprecationWarning" + "-W" + "ignore::pluggy.PluggyTeardownRaisedWarning" + "-W" + "ignore::pytest.PytestDeprecationWarning" + "-W" + "ignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Modern and fully asynchronous framework for Telegram Bot API"; From b3624536c3961b415c16c4fbd36b3b55673a095b Mon Sep 17 00:00:00 2001 From: Adrien Langou Date: Fri, 26 Apr 2024 19:10:10 +0200 Subject: [PATCH 32/45] olvid: 1.5.0 -> 1.5.2 --- pkgs/by-name/ol/olvid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix index 1aaf472fef5a..bd0eb63a9af7 100644 --- a/pkgs/by-name/ol/olvid/package.nix +++ b/pkgs/by-name/ol/olvid/package.nix @@ -53,14 +53,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "olvid"; - version = "1.5.0"; + version = "1.5.2"; dontUnpack = true; dontWrapGApps = true; src = fetchurl { url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz"; - hash = "sha256-iiMc9mM+uUVeS1i1gzXMZaMwSChdz7vNrL9uqJlR8NU="; + hash = "sha256-WjIOk3dPSXQdAR2fdXseV0NdOjld0PzyqnUx/VbvQio="; }; nativeBuildInputs = [ From ba69cd4eb436dd367f3f4ec37d0c2f93db7af287 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 19 Apr 2024 16:37:43 -0700 Subject: [PATCH 33/45] llvmPackages_18: 18.1.3 -> 18.1.4 --- pkgs/development/compilers/llvm/18/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 4d2b160a23ff..3c78cd44fdf5 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "18.1.3"; sha256 = "sha256-saQGbpYd95JuudwLcdG80GL8YhadH7TUY1FC0o0ithY="; } +, officialRelease ? { version = "18.1.4"; sha256 = "sha256-LyQEb4ZJXm2hkPOM9XITIploMT2VKIQWxUFio7SXrc0="; } # i.e.: # { # version = /* i.e. "15.0.0" */; From f7ae5ead090e8b217e425d0326d83cb857a5c518 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Wed, 17 Apr 2024 20:04:29 +0200 Subject: [PATCH 34/45] drawio: 24.1.0 -> 24.2.5 https://github.com/jgraph/drawio-desktop/releases/tag/v24.2.5 --- pkgs/applications/graphics/drawio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index b53879974d00..330e88c50ef7 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.1.0"; + version = "24.2.5"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU="; + hash = "sha256-8Cs+uME6uXWIWeuS9cgKnlYJG/m13l2BIVNDG0bqEmc="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ="; + hash = "sha256-tQFcdZc+4N6TYY6MDAwUgpaIvqYkU681DbuYCQhvJ1c="; }; nativeBuildInputs = [ From 9255c4d2d02f842f6b9c44ecf043687389fba038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 28 Apr 2024 18:55:21 +0200 Subject: [PATCH 35/45] treewide: adopt orphaned packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/applications/version-management/git-backup/default.nix | 2 +- pkgs/applications/version-management/git-gone/default.nix | 2 +- pkgs/applications/version-management/git-quickfix/default.nix | 2 +- pkgs/applications/version-management/git-trim/default.nix | 2 +- pkgs/by-name/rq/rqbit/package.nix | 2 +- pkgs/by-name/xi/xiu/package.nix | 2 +- pkgs/shells/nsh/default.nix | 2 +- pkgs/tools/graphics/svgbob/default.nix | 2 +- pkgs/tools/misc/natls/default.nix | 2 +- pkgs/tools/misc/snore/default.nix | 2 +- pkgs/tools/networking/gping/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index badb3323094b..5f582ca64c30 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jsdw/git-backup"; description = "A tool to help you backup your git repositories from services like GitHub"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-backup"; }; } diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 96fbabff991c..884eeb893ac4 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/swsnr/git-gone"; changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-gone"; }; } diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index ba2c42e01aeb..cfed9952f79e 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/siedentop/git-quickfix"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-quickfix"; }; } diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 828beeb4480e..a387ec706718 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { description = "Automatically trims your branches whose tracking remote refs are merged or gone"; homepage = "https://github.com/foriequal0/git-trim"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-trim"; }; } diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index ee20fe6a1f3a..0aece0632d19 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ikatson/rqbit"; changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "rqbit"; }; } diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 63966571dfea..7857c9b1c3e6 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/harlanc/xiu"; changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "xiu"; }; } diff --git a/pkgs/shells/nsh/default.nix b/pkgs/shells/nsh/default.nix index 5170a6232504..365c14bc5c6d 100644 --- a/pkgs/shells/nsh/default.nix +++ b/pkgs/shells/nsh/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nuta/nsh"; changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md"; license = [ licenses.cc0 /* or */ licenses.mit ]; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; }; passthru = { diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 86497d58fe4b..d852e3d17d88 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ivanceras/svgbob"; changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "svgbob"; }; } diff --git a/pkgs/tools/misc/natls/default.nix b/pkgs/tools/misc/natls/default.nix index 626cbb2f7f40..a324768faea4 100644 --- a/pkgs/tools/misc/natls/default.nix +++ b/pkgs/tools/misc/natls/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "the 'ls' replacement you never knew you needed"; homepage = "https://github.com/willdoescode/nat"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "natls"; }; } diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/tools/misc/snore/default.nix index ae173063c1ef..572f504873f8 100644 --- a/pkgs/tools/misc/snore/default.nix +++ b/pkgs/tools/misc/snore/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "sleep with feedback"; homepage = "https://github.com/clamiax/snore"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ cafkafk ]; platforms = platforms.unix; mainProgram = "snore"; }; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index a393af84c024..1a3303049e04 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orf/gping"; changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "gping"; }; } From 07a57da4df733c09b0c55b4b0acf8b5585f79ffc Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 28 Apr 2024 18:20:40 +0100 Subject: [PATCH 36/45] treewide: adopt orphaned packages --- pkgs/applications/version-management/gitprompt-rs/default.nix | 3 +-- pkgs/development/tools/go-toml/default.nix | 3 +-- pkgs/development/tools/gotestsum/default.nix | 3 +-- pkgs/tools/networking/goflow2/default.nix | 3 +-- pkgs/tools/security/step-cli/default.nix | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix index 3fc0d379af19..c4729126c037 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -1,5 +1,4 @@ { lib, fetchFromGitHub, rustPlatform, git }: - rustPlatform.buildRustPackage rec { pname = "gitprompt-rs"; version = "0.3.0"; @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Simple Git prompt"; homepage = "https://github.com/9ary/gitprompt-rs"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; mainProgram = "gitprompt-rs"; }; } diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 2fcb524b5930..6e0cf84a82cc 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -1,5 +1,4 @@ { lib, buildGoModule, fetchFromGitHub }: - buildGoModule rec { pname = "go-toml"; version = "2.2.1"; @@ -25,7 +24,7 @@ buildGoModule rec { description = "Go library for the TOML language"; homepage = "https://github.com/pelletier/go-toml"; changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}"; - maintainers = [ ]; + maintainers = [ maintainers.isabelroses ]; license = licenses.mit; }; } diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index e3528c272192..c6ff6001e6c7 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildGoModule }: - buildGoModule rec { pname = "gotestsum"; version = "1.10.1"; @@ -33,6 +32,6 @@ buildGoModule rec { mainProgram = "gotestsum"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; }; } diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/tools/networking/goflow2/default.nix index 2a278a1c2a49..0909d0c7062c 100644 --- a/pkgs/tools/networking/goflow2/default.nix +++ b/pkgs/tools/networking/goflow2/default.nix @@ -2,7 +2,6 @@ , buildGoModule , fetchFromGitHub }: - buildGoModule rec { pname = "goflow2"; version = "2.1.3"; @@ -26,6 +25,6 @@ buildGoModule rec { description = "High performance sFlow/IPFIX/NetFlow Collector"; homepage = "https://github.com/netsampler/goflow2"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index afa484f6568b..d52a828ca590 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { homepage = "https://smallstep.com/cli/"; changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "step"; }; From 56782917415f842552b60a04d54216f534ecc220 Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 28 Apr 2024 19:47:16 +0100 Subject: [PATCH 37/45] treewide: reformat --- .../version-management/gitprompt-rs/default.nix | 11 ++++++++--- pkgs/development/tools/go-toml/default.nix | 11 +++++++++-- pkgs/development/tools/gotestsum/default.nix | 7 ++++--- pkgs/tools/networking/goflow2/default.nix | 7 ++++--- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix index c4729126c037..5447babaea16 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, rustPlatform, git }: +{ + lib, + fetchFromGitHub, + rustPlatform, + git, +}: rustPlatform.buildRustPackage rec { pname = "gitprompt-rs"; version = "0.3.0"; @@ -13,8 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; postPatch = '' - substituteInPlace src/main.rs \ - --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' ''; meta = with lib; { diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 6e0cf84a82cc..24b673cbf021 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "go-toml"; version = "2.2.1"; @@ -18,7 +22,10 @@ buildGoModule rec { "cmd/tomltestgen" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Go library for the TOML language"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index c6ff6001e6c7..f28f3f12970c 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, buildGoModule +{ + lib, + fetchFromGitHub, + buildGoModule, }: buildGoModule rec { pname = "gotestsum"; diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/tools/networking/goflow2/default.nix index 0909d0c7062c..6edd9b87f657 100644 --- a/pkgs/tools/networking/goflow2/default.nix +++ b/pkgs/tools/networking/goflow2/default.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "goflow2"; From be5f1347c71e06e5d201e154c6a97c5cd34e58e3 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Sun, 28 Apr 2024 20:53:01 +0200 Subject: [PATCH 38/45] Remove 'gilligan' as maintainer --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/volnoti/default.nix | 2 +- pkgs/development/tools/misc/hydra-cli/default.nix | 2 +- pkgs/development/web/nodejs/nodejs.nix | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 103b15e37926..f401de4e995c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7354,12 +7354,6 @@ githubId = 104317939; name = "gilice"; }; - gilligan = { - email = "tobias.pflug@gmail.com"; - github = "gilligan"; - githubId = 27668; - name = "Tobias Pflug"; - }; gin66 = { email = "jochen@kiemes.de"; github = "gin66"; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index b54df7e95168..bd61cd753f98 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.gilligan ]; + maintainers = []; }; } diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 6044aa99216b..104f105ac4ce 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ gilligan lewo ]; + maintainers = with maintainers; [ lewo ]; }; } diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 987749a1eb72..91038467914d 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -206,7 +206,7 @@ let homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu gilligan cko ]; + maintainers = with maintainers; [ goibhniu cko ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; From dc3fb07fed439a7930d51a3612ca7ac19742b1a5 Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Sun, 28 Apr 2024 20:52:36 +0200 Subject: [PATCH 39/45] rmenu: 1.2.1 -> 1.2.2 --- pkgs/by-name/rm/rmenu/Cargo.lock | 260 +++++++++++++++--------------- pkgs/by-name/rm/rmenu/package.nix | 4 +- 2 files changed, 134 insertions(+), 130 deletions(-) diff --git a/pkgs/by-name/rm/rmenu/Cargo.lock b/pkgs/by-name/rm/rmenu/Cargo.lock index 33210d3b2f2d..6ed58a03c5e4 100644 --- a/pkgs/by-name/rm/rmenu/Cargo.lock +++ b/pkgs/by-name/rm/rmenu/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayref" @@ -105,27 +105,26 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -136,7 +135,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-executor", "async-io 2.3.2", "async-lock 3.3.0", @@ -177,8 +176,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -232,19 +231,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -357,18 +356,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -489,9 +486,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cesu8" @@ -512,9 +509,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -557,7 +554,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -610,9 +607,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -620,9 +617,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -772,7 +769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -843,7 +840,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -876,7 +873,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -900,7 +897,7 @@ dependencies = [ [[package]] name = "desktop" -version = "0.0.1" +version = "0.0.2" dependencies = [ "freedesktop-desktop-entry", "freedesktop-icons", @@ -968,7 +965,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1079,7 +1076,7 @@ dependencies = [ "dioxus-core", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1161,9 +1158,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "enumset" @@ -1183,7 +1180,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1265,9 +1262,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1284,9 +1281,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1309,9 +1306,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" dependencies = [ "crc32fast", "miniz_oxide", @@ -1480,7 +1477,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1495,7 +1492,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1822,7 +1819,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2324,9 +2321,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2674,9 +2671,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2684,15 +2681,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2799,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -2840,15 +2837,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -2867,12 +2864,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2917,9 +2914,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2935,9 +2932,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3037,11 +3034,11 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -3137,7 +3134,7 @@ dependencies = [ [[package]] name = "rmenu" -version = "1.2.1" +version = "1.2.2" dependencies = [ "cached 0.44.0", "clap", @@ -3257,9 +3254,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3333,9 +3330,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -3352,20 +3349,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa 1.0.11", "ryu", @@ -3380,7 +3377,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3639,9 +3636,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3774,22 +3771,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3870,7 +3867,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3891,7 +3888,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -3916,15 +3913,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -3946,7 +3943,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4211,7 +4208,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -4245,7 +4242,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4268,9 +4265,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd595fb70f33583ac61644820ebc144a26c96028b625b96cafcd861f4743fbc8" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" dependencies = [ "core-foundation", "home", @@ -4380,7 +4377,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix 0.38.34", ] [[package]] @@ -4401,11 +4398,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4498,7 +4495,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4533,17 +4530,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4566,9 +4564,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4584,9 +4582,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4602,9 +4600,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4620,9 +4624,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4638,9 +4642,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4656,9 +4660,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4674,9 +4678,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -4689,9 +4693,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix index 15de597438fa..a7a11f750540 100644 --- a/pkgs/by-name/rm/rmenu/package.nix +++ b/pkgs/by-name/rm/rmenu/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "rmenu"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "imgurbot12"; repo = "rmenu"; - hash = "sha256-JHJZfDxrDi0rJSloPdOVdvo/XkrFhvshd7yZWn/zELU="; + hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4="; }; nativeBuildInputs = [ From b76dcf4604fab6396e8dbedd7c2bfa31b10c8279 Mon Sep 17 00:00:00 2001 From: purrpurrn Date: Sun, 28 Apr 2024 22:57:43 +0200 Subject: [PATCH 40/45] mpvScripts.memo: init at 0-unstable-2023-10-31 --- .../video/mpv/scripts/default.nix | 1 + pkgs/applications/video/mpv/scripts/memo.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/memo.nix diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index fac7c910d57a..c20ac69ab068 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -69,6 +69,7 @@ let cutter = callPackage ./cutter.nix { }; dynamic-crop = callPackage ./dynamic-crop.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; + memo = callPackage ./memo.nix { }; modernx = callPackage ./modernx.nix { }; modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix new file mode 100644 index 000000000000..5361b796268e --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/memo.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub +, buildLua +, lib +, unstableGitUpdater +}: + +buildLua { + pname = "memo"; + version = "0-unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "memo"; + rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; + hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + }; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "A recent files menu for mpv"; + homepage = "https://github.com/po5/memo"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ purrpurrn ]; + }; +} From dab2685da75d5d119a8cf65bbcdf9909fb948c66 Mon Sep 17 00:00:00 2001 From: purrpurrn Date: Sun, 28 Apr 2024 23:11:05 +0200 Subject: [PATCH 41/45] maintainer: add purrpurrn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f401de4e995c..28bef032be9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16313,6 +16313,12 @@ githubId = 5636; name = "Steve Purcell"; }; + purrpurrn = { + email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com"; + github = "purrpurrn"; + githubId = 142632643; + name = "purrpurrn"; + }; putchar = { email = "slim.cadoux@gmail.com"; matrix = "@putch4r:matrix.org"; From 7a2b30600177edba20668ccc88cf5bcfa131ca61 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 28 Apr 2024 23:28:46 +0200 Subject: [PATCH 42/45] nixos-option: fix self inclusive src --- pkgs/tools/nix/nixos-option/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix index 37018ac25a0b..d6cfc630d6e3 100644 --- a/pkgs/tools/nix/nixos-option/default.nix +++ b/pkgs/tools/nix/nixos-option/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { name = "nixos-option"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.fileFilter (file: file.name != "default.nix") ./.; + }; postInstall = '' installManPage ${./nixos-option.8} ''; From 4474b70eb4bd51737b1a76658df9e8eadf576d2e Mon Sep 17 00:00:00 2001 From: Aroun Date: Mon, 29 Apr 2024 03:59:02 +0530 Subject: [PATCH 43/45] obs-studio-plugins.obs-backgroundremoval: 0.5.16 -> 1.1.13 (#230775) * obs-backgroundremoval: 0.5.16 -> 1.1.13 * Update pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix Co-authored-by: Sandro * relative path --------- Co-authored-by: Sandro --- .../plugins/obs-backgroundremoval/default.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix index 766fca414cd8..638d0785f4c8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix @@ -2,37 +2,45 @@ , stdenv , fetchFromGitHub , cmake +, ninja , obs-studio , onnxruntime , opencv +, qt6 +, curl }: stdenv.mkDerivation rec { pname = "obs-backgroundremoval"; - version = "0.5.16"; + version = "1.1.13"; src = fetchFromGitHub { - owner = "royshil"; + owner = "occ-ai"; repo = "obs-backgroundremoval"; - rev = "v${version}"; - hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc="; + rev = version; + hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ obs-studio onnxruntime opencv qt6.qtbase curl ]; dontWrapQtApps = true; cmakeFlags = [ + "--preset linux-x86_64" + "-DCMAKE_MODULE_PATH:PATH=${src}/cmake" "-DUSE_SYSTEM_ONNXRUNTIME=ON" "-DUSE_SYSTEM_OPENCV=ON" + "-DDISABLE_ONNXRUNTIME_GPU=ON" ]; - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs + buildPhase = '' + cd .. + cmake --build build_x86_64 --parallel + ''; + + installPhase = '' + cmake --install build_x86_64 --prefix "$out" ''; meta = with lib; { @@ -40,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/royshil/obs-backgroundremoval"; maintainers = with maintainers; [ zahrun ]; license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" ]; }; } From 8e1bfd5a49c7794b3ca5cc4f2e094527687b37a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 18:41:36 +0000 Subject: [PATCH 44/45] python311Packages.snakemake-interface-storage-plugins: 3.2.1 -> 3.2.2 --- .../snakemake-interface-storage-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index f620cd0c044d..6df9688d1064 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.1"; + version = "3.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hOZIdYL9YcKmZCTnKA4GbvvvPJ6pUcMLGvU5uYQHokw="; + hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec="; }; nativeBuildInputs = [ From f2c7ecb8a4409513e65ff3643d7bcf0b8c068d5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Apr 2024 18:40:50 +0000 Subject: [PATCH 45/45] snakemake: 8.10.7 -> 8.11.0 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index e543c10d4bcb..fa670b85621c 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.10.7"; + version = "8.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tRjyv7pTTTDj3LrcIP3OWOX+9FldHV6rtbPdOYr70E4="; + hash = "sha256-bAzhQMGI4t/ftcZnz6h/PmlDlGgMU8vFVHb9QXED/Hw="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'