From be26791c5bf1386e599f40b628b18b9e2e64f866 Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Thu, 21 Sep 2023 09:34:16 +0200 Subject: [PATCH 01/63] vrc-get: 1.1.3 -> 1.3.0 --- pkgs/tools/misc/vrc-get/Cargo.lock | 1746 +++++++++++++++++++++++++++ pkgs/tools/misc/vrc-get/default.nix | 12 +- 2 files changed, 1754 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/misc/vrc-get/Cargo.lock diff --git a/pkgs/tools/misc/vrc-get/Cargo.lock b/pkgs/tools/misc/vrc-get/Cargo.lock new file mode 100644 index 000000000000..4eafab4798a1 --- /dev/null +++ b/pkgs/tools/misc/vrc-get/Cargo.lock @@ -0,0 +1,1746 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-compression" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +dependencies = [ + "deflate64", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "async_zip" +version = "0.0.15" +source = "git+https://github.com/Majored/rs-async-zip.git?rev=a58024e#a58024eee84d3d50e105de79bd6210f832667984" +dependencies = [ + "async-compression", + "crc32fast", + "futures-util", + "pin-project", + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.1", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "deflate64" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30dc5bb425a582de72bb57130320aac133893ea85f6151f79bd9aa9067114f60" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide 0.6.2", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "h2" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "ipnet" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "111.25.0+1.1.1t" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "reqwest" +version = "0.11.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "security-framework" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645926f31b250a2dca3c232496c2d898d91036e45ca0e97e0e2390c54e11be36" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.4", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046be40136ef78dc325e0edefccf84ccddacd0afcc1ca54103fa3c61bbdab1d" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vrc-get" +version = "1.3.0" +dependencies = [ + "async_zip", + "clap", + "clap_complete", + "env_logger", + "futures", + "indexmap 2.0.0", + "itertools", + "log", + "pin-project-lite", + "reqwest", + "semver", + "serde", + "serde_json", + "sha2", + "tokio", + "tokio-util", + "uuid", + "windows", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[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.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index c0099d822e40..ba2bb3428f15 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -2,14 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.1.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "anatawa12"; repo = pname; rev = "v${version}"; - hash = "sha256-CJBwW2QsLNLyNubawBPD+Cy74JrrdSUHe7JBSdbMnjY="; - fetchSubmodules = true; + hash = "sha256-FCLIc5c+50qGpBEbJ4bUSNAfQVdpeswNwiWrVcO91zI="; }; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +18,12 @@ rustPlatform.buildRustPackage rec { # Make openssl-sys use pkg-config. OPENSSL_NO_VENDOR = 1; - cargoHash = "sha256-PnNo+MmBo/Ke7pL6KwRKXz3gycJmbYefTRMWOvlCQaQ="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "async_zip-0.0.15" = "sha256-UXBVZy3nf20MUh9jQdYeS5ygrZfeRWtiNRtiyMvkdSs="; + }; + }; meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; From f1137c4db54e42d986c87bcc1f354002fdde620e Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 11 Oct 2023 08:25:41 +0200 Subject: [PATCH 02/63] open62541: 1.3.7 -> 1.3.8 https://github.com/open62541/open62541/releases/tag/v1.3.8 --- pkgs/development/libraries/open62541/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/development/libraries/open62541/default.nix index e25ac7bfca51..7799c6d80ae3 100644 --- a/pkgs/development/libraries/open62541/default.nix +++ b/pkgs/development/libraries/open62541/default.nix @@ -5,8 +5,10 @@ , cmake , pkg-config , check +, libxcrypt , subunit , python3Packages +, nix-update-script , withDoc ? false , graphviz-nox @@ -31,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-XmoLmBGTMA6cejLiNU8hAVnHd35eh6lTIu9csmiR+4U="; + hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4="; fetchSubmodules = true; }; @@ -82,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ check + libxcrypt subunit ]; @@ -126,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: { rm -r bin/libopen62541* ''; + passthru.updateScript = nix-update-script { }; + passthru.tests = let open62541Full = encBackend: open62541.override { withDoc = true; @@ -151,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: { OPC UA-based communication into existing applications. ''; homepage = "https://www.open62541.org"; + changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}"; license = licenses.mpl20; maintainers = with maintainers; [ panicgh ]; platforms = platforms.linux; From 0ddd921ebd0c3045382e0539c328d3ebf0bb4e5a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 2 Jul 2023 02:05:55 +0200 Subject: [PATCH 03/63] vagrant: 2.3.4 -> 2.3.7 File in post fixup phase got deleted by upstream, no longer needed. https://github.com/hashicorp/vagrant/commit/7db87b9da37e019e0201e0f8c7517da553a8910f Patch needed some changes to work with newest version of vagrant. https://github.com/hashicorp/vagrant/commit/3422582d68e94bb1c4da64512ac9a2c3654237d6 https://github.com/hashicorp/vagrant/releases/tag/v2.3.5 https://github.com/hashicorp/vagrant/releases/tag/v2.3.6 https://github.com/hashicorp/vagrant/releases/tag/v2.3.7 --- ...-pull-request-12225-from-chrisroberts-re.patch | 15 +++++++++++---- pkgs/development/tools/vagrant/default.nix | 15 ++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch index 6109101b7ba9..75b8f0cf8dfe 100644 --- a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch +++ b/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch @@ -214,7 +214,7 @@ index edae9b477..782904f49 100644 cloud init command '%{cmd}' failed on guest '%{guest_name}'. command_deprecated: |- The command 'vagrant %{name}' has been deprecated and is no longer functional -@@ -1238,23 +1238,6 @@ en: +@@ -1245,30 +1245,6 @@ en: following command: vagrant plugin install --local @@ -225,12 +225,19 @@ index edae9b477..782904f49 100644 - again. - plugin_missing_library: |- - Vagrant failed to install the requested plugin because it depends -- on a library which is not currently installed on this system. The -- following library is required by the '%{name}' plugin: +- on development files for a library which is not currently installed +- on this system. The following library is required by the '%{name}' +- plugin: - - %{library} - -- Please install the library and then run the command again. +- If a package manager is used on this system, please install the development +- package for the library. The name of the package will be similar to: +- +- %{library}-dev or %{library}-devel +- +- After the library and development files have been installed, please +- run the command again. - plugin_missing_ruby_dev: |- - Vagrant failed to install the requested plugin because the Ruby header - files could not be found. Install the ruby development package for your diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3b03e4426ba6..5dc9e46671e9 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.3.4"; + version = "2.3.7"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8="; + hash = "sha256-+oqWMZqnuf9fSpkbd8vzf1SVSdhHN2JLzr76jyAEv0U="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -21,7 +21,7 @@ let vagrant = { source = { type = "url"; - inherit url sha256; + inherit url hash; }; inherit version; }; @@ -48,7 +48,7 @@ in buildRubyGem rec { doInstallCheck = true; dontBuild = false; - src = fetchurl { inherit url sha256; }; + src = fetchurl { inherit url hash; }; patches = [ ./unofficial-installation-nowarn.patch @@ -98,13 +98,6 @@ in buildRubyGem rec { HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null ''; - # `patchShebangsAuto` patches this one script which is intended to run - # on foreign systems. - postFixup = '' - sed -i -e '1c#!/bin/sh -' \ - $out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh - ''; - passthru = { inherit ruby deps; }; From 1b9c8b2d0f11131e5373de65d5abcafe7838f8f3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 2 Jul 2023 02:11:13 +0200 Subject: [PATCH 04/63] vagrant: libvirt-provider: 0.8.2 -> 0.12.2 https://github.com/vagrant-libvirt/vagrant-libvirt/compare/0.8.2...0.12.2 --- .../tools/vagrant/gemset_libvirt.nix | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index 438d436869f6..d31b76a4e7f8 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s8b3bsajwjyrjs53h0nrfrpzzgi8igsrslprhr6fgl80ig3plld"; + sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; type = "gem"; }; - version = "0.9.0"; + version = "0.11.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -109,10 +109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; type = "gem"; }; - version = "2.8.0"; + version = "2.8.2"; }; multi_json = { groups = ["default"]; @@ -130,20 +130,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; + sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; type = "gem"; }; - version = "1.13.6"; + version = "1.15.2"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; rexml = { groups = ["default"]; @@ -155,6 +155,26 @@ }; version = "3.2.5"; }; + xml-simple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; + type = "gem"; + }; + version = "1.1.9"; + }; + diffy = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; + type = "gem"; + }; + version = "3.4.2"; + }; ruby-libvirt = { groups = ["default"]; platforms = []; @@ -166,14 +186,14 @@ version = "0.8.0"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml"]; + dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j31y6sjhslj5yr0ssvb36ngm7prfsbdfj6131757jl0l0ri8pyv"; + sha256 = "sha256-NMiRjrVQo2Ui9nOJwpDmNJUk+95gsT85pwFMIiw3bwQ="; type = "gem"; }; - version = "0.8.2"; + version = "0.12.2"; }; } From 0cb07e0d469303f989acf9d4263f567a5a91eb45 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 18 Oct 2023 21:26:16 -0500 Subject: [PATCH 05/63] chiaki4deck: 1.4.0 -> 1.4.1 --- pkgs/games/chiaki4deck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index 850e67eefcef..01c505d60f27 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "chiaki4deck"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-udSGtpBUbxEZU9l+jLmUWJbkaCxKGoPuKAaYVmEEezk="; + hash = "sha256-W/t9uYApt8j5UMjtVWhFtq+IHmu9vi6M92I8N4kRtEk="; fetchSubmodules = true; }; From 3418c7c1e719658cab509347ad4995ef0e67998c Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 27 Oct 2023 09:43:36 +1100 Subject: [PATCH 06/63] jetbrains: Append Python to PATH rather than prepend --- pkgs/applications/editors/jetbrains/linux.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 4a89ae202858..46cf00ea2131 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -120,7 +120,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { item=${desktopItem} wrapProgram "$out/$pname/bin/${loName}.sh" \ - --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \ + --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --suffix PATH : "${lib.makeBinPath [ python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ From 749d5f3b0f59b016be17da3009276d5f2f886931 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 30 Oct 2023 22:37:04 +0200 Subject: [PATCH 07/63] fend: add `meta.changelog` --- pkgs/tools/misc/fend/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index fe1d957437d0..f84322ad7076 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -63,6 +63,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; + changelog = "https://github.com/printfn/fend/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ djanatyn liff ]; mainProgram = "fend"; From 1617eeca678b9b1a2e52e3474ee4b624b5efa12f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 29 Oct 2023 09:58:16 +0200 Subject: [PATCH 08/63] fend: add package tests --- pkgs/tools/misc/fend/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index f84322ad7076..12e88857b871 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -8,6 +8,10 @@ , copyDesktopItems , makeDesktopItem , nix-update-script +, testers +, writeText +, runCommand +, fend }: rustPlatform.buildRustPackage rec { @@ -58,7 +62,21 @@ rustPlatform.buildRustPackage rec { }) ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { package = fend; }; + units = testers.testEqualContents { + assertion = "fend does simple math and unit conversions"; + expected = writeText "expected" '' + 36 kph + ''; + actual = runCommand "actual" { } '' + ${lib.getExe fend} '(100 meters) / (10 seconds) to kph' > $out + ''; + }; + }; + }; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; From 8e78c0ebac6017e6b06986ad0741d10b926e492c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 9 Nov 2023 20:56:30 +0100 Subject: [PATCH 09/63] monado: unstable-2023-08-22 -> unstable-2023-11-09 Signed-off-by: Sefa Eyeoglu --- pkgs/applications/graphics/monado/default.nix | 13 +++++-------- .../monado/steamvr_lh-use-old-interface.patch | 13 ------------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index c8c5e5abb37d..d6109079f2ae 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -48,16 +48,16 @@ , serviceSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "monado"; - version = "unstable-2023-08-22"; + version = "unstable-2023-11-09"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6"; - sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8="; + rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f"; + hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0="; }; nativeBuildInputs = [ @@ -135,16 +135,13 @@ stdenv.mkDerivation rec { patches = [ # We don't have $HOME/.steam when building ./force-enable-steamvr_lh.patch - - # A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado - ./steamvr_lh-use-old-interface.patch ]; meta = with lib; { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch b/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch deleted file mode 100644 index d5194956e114..000000000000 --- a/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -index 24b69fd..5b3a5ca 100644 ---- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp -@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver) - vr::EVRInitError err = driver->Activate(0); - VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str()); - -- auto *display = static_cast(driver->GetComponent(vr::IVRDisplayComponent_Version)); -+ auto *display = static_cast(driver->GetComponent("IVRDisplayComponent_003")); - VERIFY(display, "IVRDisplayComponent is null"); - #undef VERIFY - From 9d68ff32d7d4428adde249eb3db45c904fa78d1f Mon Sep 17 00:00:00 2001 From: Snowflake Date: Fri, 10 Nov 2023 14:35:56 +0800 Subject: [PATCH 10/63] gifgen: init at 1.2.0 --- pkgs/by-name/gi/gifgen/package.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/gi/gifgen/package.nix diff --git a/pkgs/by-name/gi/gifgen/package.nix b/pkgs/by-name/gi/gifgen/package.nix new file mode 100644 index 000000000000..49c87eda795d --- /dev/null +++ b/pkgs/by-name/gi/gifgen/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, ffmpeg +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "gifgen"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "lukechilds"; + repo = "gifgen"; + rev = version; + hash = "sha256-ni9RL4LyMejmu8vm5HC8WSTqAPQMBQNRDOZ4ZfvrkSU="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + install -Dm755 gifgen $out/bin/gifgen + wrapProgram $out/bin/gifgen \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + runHook postInstall + ''; + + meta = with lib; { + description = "Simple high quality GIF encoding"; + homepage = "https://github.com/lukechilds/gifgen"; + license = licenses.mit; + maintainers = with maintainers; [ snowflake ]; + mainProgram = "gifgen"; + platforms = platforms.all; + }; +} From 2c816df73285f93ab42de590e529d87490c715a8 Mon Sep 17 00:00:00 2001 From: Snowflake Date: Fri, 10 Nov 2023 20:23:24 +0800 Subject: [PATCH 11/63] emojify: init at 2.2.0 --- pkgs/by-name/em/emojify/package.nix | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/em/emojify/package.nix diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix new file mode 100644 index 000000000000..05833d931654 --- /dev/null +++ b/pkgs/by-name/em/emojify/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "emojify"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "mrowa44"; + repo = "emojify"; + rev = version; + hash = "sha256-6cV+S8wTqJxPGsxiJ3hP6/CYPMWdF3qnz4ddL+F/oJU="; + }; + + installPhase = '' + runHook preInstall + install -Dm755 emojify $out/bin/emojify + runHook postInstall + ''; + + meta = with lib; { + description = "Emoji on the command line"; + homepage = "https://github.com/mrowa44/emojify"; + license = licenses.mit; + maintainers = with maintainers; [ snowflake ]; + platforms = platforms.all; + mainProgram = "emojify"; + }; +} From cd49f6378c53e3815dd87ed6bca1dccc6981f4c0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:38:44 +0900 Subject: [PATCH 12/63] python311Packages.zope-configuration: rename frome zope_configuration --- pkgs/development/python-modules/zope-component/default.nix | 4 ++-- .../{zope_configuration => zope-configuration}/default.nix | 5 +++-- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{zope_configuration => zope-configuration}/default.nix (88%) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 522b2817a845..44f01efa8d2e 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_configuration +, zope-configuration , zope-deferredimport , zope-deprecation , zope_event @@ -22,7 +22,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - zope_configuration + zope-configuration zope-deferredimport zope-deprecation zope_event diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix similarity index 88% rename from pkgs/development/python-modules/zope_configuration/default.nix rename to pkgs/development/python-modules/zope-configuration/default.nix index b6cc1c0f9998..ac2db40e0b13 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "zope.configuration"; + pname = "zope-configuration"; version = "4.4.1"; src = fetchPypi { - inherit pname version; + pname = "zope.configuration"; + inherit version; hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 955c553d8a74..f64c3f1a29c8 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { requests sqlalchemy zope-component - zope_configuration + zope-configuration ]; checkInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b23c39627f81..766b9aec93f8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -455,6 +455,7 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 + zope_configuration = zope-configuration; # added 2023-11-12 zope_contenttype = zope-contenttype; # added 2023-10-11 zope_deprecation = zope-deprecation; # added 2023-10-07 zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d631c0e2f6a..6e8361b4b065 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16077,7 +16077,7 @@ self: super: with self; { zope-component = callPackage ../development/python-modules/zope-component { }; - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + zope-configuration = callPackage ../development/python-modules/zope-configuration { }; zope-contenttype = callPackage ../development/python-modules/zope-contenttype { }; From e5317b9352594a61f0070f797f17974852e0cff7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:52:26 +0900 Subject: [PATCH 13/63] python311Packages.zope-configuration: refactor --- .../zope-configuration/default.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index ac2db40e0b13..c3593f46146c 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,8 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , zope-i18nmessageid +, zope_interface , zope_schema +, pytestCheckHook +, zope_testing , zope_testrunner , manuel }: @@ -10,6 +14,7 @@ buildPythonPackage rec { pname = "zope-configuration"; version = "4.4.1"; + pyproject = true; src = fetchPypi { pname = "zope.configuration"; @@ -17,18 +22,39 @@ buildPythonPackage rec { hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; - nativeCheckInputs = [ zope_testrunner manuel ]; + nativeBuildInputs = [ + setuptools + ]; - propagatedBuildInputs = [ zope-i18nmessageid zope_schema ]; + nativeCheckInputs = [ + manuel + pytestCheckHook + zope_testing + zope_testrunner + ]; + + propagatedBuildInputs = [ + zope-i18nmessageid + zope_interface + zope_schema + ]; # Need to investigate how to run the tests with zope-testrunner doCheck = false; + pythonImportsCheck = [ + "zope.configuration" + ]; + + pythonNamespaces = [ + "zope" + ]; + meta = with lib; { description = "Zope Configuration Markup Language (ZCML)"; homepage = "https://github.com/zopefoundation/zope.configuration"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.configuration/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; - } From 98b74e8ae768e0e8d5df13966b591a225aeaacda Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:54:03 +0900 Subject: [PATCH 14/63] python311Packages.zope-configuration: 4.4.1 -> 5.0 Changelog: https://github.com/zopefoundation/zope.configuration/blob/5.0/CHANGES.rst --- .../python-modules/zope-configuration/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index c3593f46146c..b1c6e027a36d 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , zope-i18nmessageid , zope_interface @@ -13,13 +14,15 @@ buildPythonPackage rec { pname = "zope-configuration"; - version = "4.4.1"; + version = "5.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "zope.configuration"; inherit version; - hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; + hash = "sha256-I0tKGMcfazub9rzyJSZLrgFJrGjeoHsHLw9pmkzsJuc="; }; nativeBuildInputs = [ From 6f0e72c9cab6d21c68cdf1dd23762a406b9aa616 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 12:50:07 +0900 Subject: [PATCH 15/63] python311Packages.zope-testing: rename from zope_testing --- pkgs/development/python-modules/eggdeps/default.nix | 4 ++-- pkgs/development/python-modules/manuel/default.nix | 4 ++-- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- pkgs/development/python-modules/zc_lockfile/default.nix | 4 ++-- pkgs/development/python-modules/zope-hookable/default.nix | 4 ++-- pkgs/development/python-modules/zope-testbrowser/default.nix | 4 ++-- .../{zope_testing => zope-testing}/default.nix | 5 +++-- pkgs/development/python-modules/zope_schema/default.nix | 4 ++-- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) rename pkgs/development/python-modules/{zope_testing => zope-testing}/default.nix (88%) diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 9f17306b7bdc..57c73ec20ba0 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , zope_interface -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323"; }; - propagatedBuildInputs = [ zope_interface zope_testing ]; + propagatedBuildInputs = [ zope_interface zope-testing ]; # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index c0040947488f..abec37fc5ed1 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -5,7 +5,7 @@ , python , isPy27 , six -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ zope_testing ]; + nativeCheckInputs = [ zope-testing ]; meta = with lib; { description = "A documentation builder"; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 13114dd78456..fdb75e22115d 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, zope_testing +, zope-testing , setuptools }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "39bc23bbb59b765702090ad61fe579f8bd9fe1f005f4dd1c2988a5bd1a71faf0"; }; - propagatedBuildInputs = [ six setuptools zope_testing ]; + propagatedBuildInputs = [ six setuptools zope-testing ]; # Huge amount of testing dependencies (including Zope2) doCheck = false; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 70e2406ffa41..d8be54666a0d 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , mock -, zope_testing +, zope-testing , lib }: @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ zope_testing ]; + propagatedBuildInputs = [ zope-testing ]; meta = with lib; { description = "Inter-process locks"; diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 64db918321d1..a1cd30fd5478 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; - nativeCheckInputs = [ zope_testing ]; + nativeCheckInputs = [ zope-testing ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 15b3f74a4394..290066f3e157 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -12,7 +12,7 @@ , wsgiproxy2 , six , mock -, zope_testing +, zope-testing , zope_testrunner , python }: @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - zope_testing + zope-testing zope_testrunner ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix similarity index 88% rename from pkgs/development/python-modules/zope_testing/default.nix rename to pkgs/development/python-modules/zope-testing/default.nix index bc5d9ed94b2e..d742f674478a 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "zope.testing"; + pname = "zope-testing"; version = "5.0.1"; src = fetchPypi { - inherit pname version; + pname = "zope.testing"; + inherit version; hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index b3694fe09dc9..329ab7455c5c 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -4,7 +4,7 @@ , zope_location , zope_event , zope_interface -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k="; }; - propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; + propagatedBuildInputs = [ zope_location zope_event zope_interface zope-testing ]; # ImportError: No module named 'zope.event' # even though zope_event has been included. diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index d687e24082f4..2307494fcbde 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -3,7 +3,7 @@ , fetchPypi , zope_interface , zope_exceptions -, zope_testing +, zope-testing , six }: @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; + propagatedBuildInputs = [ zope_interface zope_exceptions zope-testing six ]; doCheck = false; # custom test modifies sys.path diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 30a0d6472232..78e0204ba3ca 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -462,5 +462,6 @@ mapAliases ({ zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11 zope_proxy = zope-proxy; # added 2023-10-07 + zope_testing = zope-testing; # added 2023-11-12 zxing_cpp = zxing-cpp; # added 2023-11-05 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41cf6b5344fc..22f5a2971774 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16117,7 +16117,7 @@ self: super: with self; { zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { }; - zope_testing = callPackage ../development/python-modules/zope_testing { }; + zope-testing = callPackage ../development/python-modules/zope-testing { }; zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; From 15e9135dd7ca912ee014344af13da1e7711cfe57 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 12:59:38 +0900 Subject: [PATCH 16/63] python311Packages.zope-testing: refactor --- .../python-modules/zope-testing/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index d742f674478a..65672118e4ef 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -2,14 +2,14 @@ , buildPythonPackage , fetchPypi , isPyPy -, zope_interface -, zope_exceptions -, zope_location +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "zope-testing"; version = "5.0.1"; + pyproject = true; src = fetchPypi { pname = "zope.testing"; @@ -17,15 +17,33 @@ buildPythonPackage rec { hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = !isPyPy; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/testing/tests.py" + ]; + + pythonImportsCheck = [ + "zope.testing" + ]; + + pythonNamespaces = [ + "zope" + ]; meta = with lib; { description = "Zope testing helpers"; - homepage = "http://pypi.python.org/pypi/zope.testing"; - license = licenses.zpl20; + homepage = "https://github.com/zopefoundation/zope.testing"; + changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; - } From 07ed6685dc8b4ccdae86fc301e16c395999a260f Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Wed, 15 Nov 2023 19:18:17 +0100 Subject: [PATCH 17/63] prisma-engines: 5.4.1 -> 5.6.0 --- .../tools/database/prisma-engines/Cargo.lock | 345 ++++++++++++++++-- .../tools/database/prisma-engines/default.nix | 5 +- 2 files changed, 313 insertions(+), 37 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 5f4df8b9a2f9..573e31eababd 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -321,11 +321,12 @@ version = "0.1.0" dependencies = [ "anyhow", "enumflags2", - "indoc", + "indoc 2.0.3", "insta", "query-engine-metrics", "query-engine-tests", "query-tests-setup", + "regex", "reqwest", "serde_json", "tokio", @@ -433,7 +434,7 @@ dependencies = [ "connection-string", "either", "enumflags2", - "indoc", + "indoc 2.0.3", "lsp-types", "once_cell", "psl-core", @@ -672,6 +673,16 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -860,29 +871,26 @@ dependencies = [ [[package]] name = "cuid" version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51294db11d38eb763c92936c5c88425d0090e27dce21dd15748134af9e53e739" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" dependencies = [ "base36", "cuid-util", "cuid2", - "hostname", "num", "once_cell", "rand 0.8.5", + "sha3", ] [[package]] name = "cuid-util" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea2bfe0336ff1b7ca74819b2df8dfae9afea358aff6b1688baa5c181d8c3713" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" [[package]] name = "cuid2" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d99cacd52fd67db7490ad051c8c1973fb75520174d69aabbae08c534c9d0e8" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" dependencies = [ "cuid-util", "num", @@ -890,14 +898,38 @@ dependencies = [ "sha3", ] +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + [[package]] name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", ] [[package]] @@ -914,13 +946,24 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core 0.10.2", + "quote", + "syn 1.0.109", +] + [[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", "quote", "syn 1.0.109", ] @@ -950,7 +993,7 @@ version = "0.1.0" dependencies = [ "base64 0.13.1", "expect-test", - "indoc", + "indoc 2.0.3", "once_cell", "psl", "regex", @@ -991,7 +1034,7 @@ name = "diagnostics" version = "0.1.0" dependencies = [ "colored", - "indoc", + "indoc 2.0.3", "pest", ] @@ -1036,7 +1079,7 @@ dependencies = [ "expect-test", "flate2", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "itertools", "pretty_assertions", "prisma-models", @@ -1377,6 +1420,12 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + [[package]] name = "funty" version = "2.0.0" @@ -1506,8 +1555,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1522,6 +1573,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "graphql-parser" version = "0.3.0" @@ -1822,12 +1886,35 @@ dependencies = [ "hashbrown 0.14.0", ] +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + [[package]] name = "indoc" version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", + "unindent", +] + [[package]] name = "insta" version = "1.21.2" @@ -2310,9 +2397,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b" +checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3" dependencies = [ "async-trait", "futures-channel", @@ -2426,11 +2513,11 @@ dependencies = [ "enumflags2", "expect-test", "futures", - "indoc", + "indoc 2.0.3", "mongodb", "mongodb-client", "mongodb-schema-describer", - "names", + "names 0.12.0", "once_cell", "psl", "regex", @@ -2527,6 +2614,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "names" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" +dependencies = [ + "rand 0.3.23", +] + [[package]] name = "names" version = "0.12.0" @@ -2972,6 +3068,12 @@ dependencies = [ "schema-ast", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "pbkdf2" version = "0.11.0" @@ -3234,7 +3336,7 @@ dependencies = [ "dmmf", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "log", "lsp-types", "once_cell", @@ -3251,6 +3353,7 @@ dependencies = [ "bigdecimal", "chrono", "cuid", + "getrandom 0.2.10", "itertools", "nanoid", "prisma-value", @@ -3315,6 +3418,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.66" @@ -3386,7 +3495,7 @@ dependencies = [ "dissimilar", "either", "expect-test", - "indoc", + "indoc 2.0.3", "psl-core", ] @@ -3398,7 +3507,7 @@ dependencies = [ "chrono", "diagnostics", "enumflags2", - "indoc", + "indoc 2.0.3", "itertools", "lsp-types", "once_cell", @@ -3463,16 +3572,23 @@ dependencies = [ "either", "futures", "hex", + "indoc 0.3.6", "lru-cache", "metrics 0.18.1", "mobc", "mysql_async", + "names 0.11.0", "native-tls", "num_cpus", + "once_cell", + "paste", "percent-encoding", "postgres-native-tls", "postgres-types", + "quaint-test-macros", + "quaint-test-setup", "rusqlite", + "serde", "serde_json", "sqlformat", "thiserror", @@ -3486,6 +3602,30 @@ dependencies = [ "uuid", ] +[[package]] +name = "quaint-test-macros" +version = "0.1.0" +dependencies = [ + "darling 0.10.2", + "once_cell", + "proc-macro2", + "quaint-test-setup", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quaint-test-setup" +version = "0.1.0" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "names 0.11.0", + "once_cell", + "quaint", + "tokio", +] + [[package]] name = "quanta" version = "0.9.3" @@ -3567,7 +3707,7 @@ dependencies = [ "enumflags2", "graphql-parser", "hyper", - "indoc", + "indoc 2.0.3", "mongodb-query-connector", "opentelemetry", "opentelemetry-otlp", @@ -3652,7 +3792,7 @@ dependencies = [ "colored", "enumflags2", "futures", - "indoc", + "indoc 2.0.3", "insta", "once_cell", "prisma-value", @@ -3668,11 +3808,40 @@ dependencies = [ "uuid", ] +[[package]] +name = "query-engine-wasm" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "connection-string", + "console_error_panic_hook", + "futures", + "js-sys", + "log", + "prisma-models", + "psl", + "serde", + "serde-wasm-bindgen", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", + "tsify", + "url", + "user-facing-errors", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-logger", +] + [[package]] name = "query-test-macros" version = "0.1.0" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -3687,7 +3856,7 @@ dependencies = [ "enumflags2", "hyper", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "itertools", "jsonrpc-core", "nom", @@ -3746,6 +3915,29 @@ dependencies = [ "nibble_vec", ] +[[package]] +name = "rand" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" +dependencies = [ + "libc", + "rand 0.4.6", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + [[package]] name = "rand" version = "0.7.3" @@ -3790,6 +3982,21 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + [[package]] name = "rand_core" version = "0.5.1" @@ -3848,6 +4055,15 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -4266,7 +4482,7 @@ dependencies = [ "base64 0.13.1", "connection-string", "expect-test", - "indoc", + "indoc 2.0.3", "jsonrpc-core", "quaint", "schema-connector", @@ -4370,6 +4586,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_bytes" version = "0.11.12" @@ -4390,6 +4617,17 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "serde_derive_internals" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "serde_json" version = "1.0.104" @@ -4441,7 +4679,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -4624,7 +4862,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" name = "sql-ddl" version = "0.1.0" dependencies = [ - "indoc", + "indoc 2.0.3", ] [[package]] @@ -4635,7 +4873,7 @@ dependencies = [ "connection-string", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "pretty_assertions", "psl", "quaint", @@ -4661,7 +4899,7 @@ dependencies = [ "connection-string", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "jsonrpc-core", "once_cell", "pretty_assertions", @@ -4722,7 +4960,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", - "indoc", + "indoc 2.0.3", "once_cell", "prisma-value", "psl", @@ -4753,7 +4991,7 @@ dependencies = [ "enumflags2", "expect-test", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "once_cell", "pretty_assertions", "prisma-value", @@ -4820,6 +5058,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + [[package]] name = "strsim" version = "0.10.0" @@ -5494,6 +5738,31 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "tsify" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" +dependencies = [ + "gloo-utils", + "serde", + "serde_json", + "tsify-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-macros" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.28", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -5501,7 +5770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -5573,6 +5842,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + [[package]] name = "unreachable" version = "1.0.0" @@ -5614,7 +5889,7 @@ name = "user-facing-errors" version = "0.1.0" dependencies = [ "backtrace", - "indoc", + "indoc 2.0.3", "itertools", "quaint", "serde", diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index a180878f9a1c..4d2dc3663184 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.4.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw="; + sha256 = "sha256-zyF2NAOPNJe23tIuOHalsvnYytALKZq8QY1L8EWJMno="; }; # Use system openssl. @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; + "cuid-1.3.2" = "sha256-ZihFrLerEIOdbJggaBbByRbC1sZRvF4M0LN2albB7vA="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; From 178818331eddcbcc1b032fa6314f7d04be199c2e Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Wed, 15 Nov 2023 19:21:18 +0100 Subject: [PATCH 18/63] nodePackages.prisma: 5.4.1 -> 5.6.0 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 26b1d43c256e..1f728df15a6e 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -257,7 +257,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s="; + hash = "sha256-ej3h4LlF/pkAYeDxePb7wMc8zrfxKMnrp1ogZLoFU+0="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From b8698e3189c5bef890d02cc326cac5b75dbbc160 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 20:19:04 -0400 Subject: [PATCH 19/63] davinci-resolve: 18.5.1 -> 18.6 Without libXt, shows popup on launch: > Unable to load plugin: USD.plugin > > libXt.so.6: cannot open shared object file: No such file or directory ultimately launches okay without it, but some feature would probably be broken. --- pkgs/applications/video/davinci-resolve/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 2c168912253f..e3430d7c0e0d 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -28,7 +28,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve"; - version = "18.5.1"; + version = "18.6"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -47,7 +47,7 @@ let rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AZ869hA/WeCf3sxhdDOzD/q30P1NaD18TheBtS1ammQ="; + outputHash = "sha256-Rxe5ZiLpZbEf6yh7vdIrdjULqE8gyPRarMDDZiWwJCE="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -57,7 +57,7 @@ let SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # Get linux.downloadId from HTTP response on https://www.blackmagicdesign.com/products/davinciresolve - DOWNLOADID = "defc1c6789b7475b9ee4a42daf9ba61d"; + DOWNLOADID = "cebf954f05a74eaeae6b6b14bcca7971"; REFERID = "263d62f31cbb49e0868005059abcb0c9"; SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; @@ -201,6 +201,7 @@ buildFHSEnv { xorg.libXinerama xorg.libXrandr xorg.libXrender + xorg.libXt xorg.libXtst xorg.libXxf86vm xorg.libxcb From 8e2b31fedb1ad028db7b11df8236f581e1b76b2e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 20:19:34 -0400 Subject: [PATCH 20/63] davinci-resolve: passthru underlying drv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise getting it is…non-trivial. --- pkgs/applications/video/davinci-resolve/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index e3430d7c0e0d..546b54a5da40 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -224,6 +224,8 @@ buildFHSEnv { '' }"; + passthru = { inherit davinci; }; + meta = with lib; { description = "Professional video editing, color, effects and audio post-processing"; homepage = "https://www.blackmagicdesign.com/products/davinciresolve"; From 7b93c209effcc5525bfd879ae24f0196ccfd42b5 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 20:20:38 -0400 Subject: [PATCH 21/63] davinci-resolve: fail fast if filename is incorrect `appimage-run` fails silently if the file does not exist. This made it easy to have mismatches that lead to non-obvious build errors. --- pkgs/applications/video/davinci-resolve/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 546b54a5da40..be918e56a7a8 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -111,14 +111,17 @@ let # The unpack phase won't generate a directory sourceRoot = "."; - installPhase = '' + installPhase = let + appimageName = "DaVinci_Resolve_${version}_Linux.run"; + in '' runHook preInstall export HOME=$PWD/home mkdir -p $HOME mkdir -p $out - appimage-run ./DaVinci_Resolve_${version}_Linux.run -i -y -n -C $out + test -e ${lib.escapeShellArg appimageName} + appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT} runHook postInstall From fe45cd375a4b70fe761b188b77d81c4aabd85296 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 20:21:53 -0400 Subject: [PATCH 22/63] davinci-resolve: add studioVariant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve wants to write the license to `./.license` in the drv store path. This obviously fails as it is read-only. Conveniently this is a Bubblewrap-based FHS env, so we can bind-mount a reasonable dir from $HOME to this path instead. Unfortunately, the dir needs to exist before launching, so it must be manually created presently e.g. mkdir -p ~/.local/share/DaVinciResolve/license At least the error is fairly obvious: > bwrap: Can't find source path /home/user/.local/share/DaVinciResolve/license: No such file or directory Without making the license writable, license activation will always give a generic error—the actual problem was found with strace. --- .../video/davinci-resolve/default.nix | 24 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index be918e56a7a8..56ed9e2b922e 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -22,12 +22,14 @@ , aprutil , makeDesktopItem , copyDesktopItems + +, studioVariant ? false }: let davinci = ( stdenv.mkDerivation rec { - pname = "davinci-resolve"; + pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; version = "18.6"; nativeBuildInputs = [ @@ -47,7 +49,10 @@ let rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Rxe5ZiLpZbEf6yh7vdIrdjULqE8gyPRarMDDZiWwJCE="; + outputHash = + if studioVariant + then "sha256-QjjVb9IdZ1Vcyw/O3tP9cjxVTfRGC29tkp3KReyz63I=" + else "sha256-Rxe5ZiLpZbEf6yh7vdIrdjULqE8gyPRarMDDZiWwJCE="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -57,7 +62,10 @@ let SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # Get linux.downloadId from HTTP response on https://www.blackmagicdesign.com/products/davinciresolve - DOWNLOADID = "cebf954f05a74eaeae6b6b14bcca7971"; + DOWNLOADID = + if studioVariant + then "2cdeb3d6ccfb4e65add749acb36e659b" + else "cebf954f05a74eaeae6b6b14bcca7971"; REFERID = "263d62f31cbb49e0868005059abcb0c9"; SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; @@ -77,7 +85,7 @@ let "street" = "Hogeweide 346"; "state" = "Province of Utrecht"; "city" = "Utrecht"; - "product" = "DaVinci Resolve"; + "product" = "DaVinci Resolve${if studioVariant then " Studio" else ""}"; }; } '' @@ -112,7 +120,7 @@ let sourceRoot = "."; installPhase = let - appimageName = "DaVinci_Resolve_${version}_Linux.run"; + appimageName = "DaVinci_Resolve_${lib.optionalString studioVariant "Studio_"}${version}_Linux.run"; in '' runHook preInstall @@ -165,7 +173,7 @@ let ); in buildFHSEnv { - name = "davinci-resolve"; + name = davinci.pname; targetPkgs = pkgs: with pkgs; [ alsa-lib aprutil @@ -217,6 +225,10 @@ buildFHSEnv { zlib ]; + extraBwrapArgs = lib.optionals studioVariant [ + "--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license" + ]; + runScript = "${bash}/bin/bash ${ writeText "davinci-wrapper" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b49f5814804f..3fceaa74615d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1763,6 +1763,8 @@ with pkgs; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; + davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; }; + dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { }; donkey = callPackage ../tools/security/donkey { }; From 5cfab80f9af2828c5e4e84a35ab574d363167351 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 20:38:24 -0400 Subject: [PATCH 23/63] davinci-resolve: dynamically get downloadid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The downloads.json also includes metadata for older versions, so this should be durable unless upstream breaks things. Some older downloads appear to not include the “Update” suffix in the name, so match with or without it. --- .../video/davinci-resolve/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 56ed9e2b922e..be940b0c3063 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -22,6 +22,7 @@ , aprutil , makeDesktopItem , copyDesktopItems +, jq , studioVariant ? false }: @@ -56,18 +57,17 @@ let impureEnvVars = lib.fetchers.proxyImpureEnvVars; - nativeBuildInputs = [ curl ]; + nativeBuildInputs = [ curl jq ]; # ENV VARS SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # Get linux.downloadId from HTTP response on https://www.blackmagicdesign.com/products/davinciresolve - DOWNLOADID = - if studioVariant - then "2cdeb3d6ccfb4e65add749acb36e659b" - else "cebf954f05a74eaeae6b6b14bcca7971"; REFERID = "263d62f31cbb49e0868005059abcb0c9"; - SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; + DOWNLOADSURL = "https://www.blackmagicdesign.com/api/support/us/downloads.json"; + SITEURL = "https://www.blackmagicdesign.com/api/register/us/download"; + PRODUCT = "DaVinci Resolve${lib.optionalString studioVariant " Studio"}"; + VERSION = version; USERAGENT = builtins.concatStringsSep " " [ "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" @@ -85,10 +85,16 @@ let "street" = "Hogeweide 346"; "state" = "Province of Utrecht"; "city" = "Utrecht"; - "product" = "DaVinci Resolve${if studioVariant then " Studio" else ""}"; + "product" = PRODUCT; }; } '' + DOWNLOADID=$( + curl --silent --compressed "$DOWNLOADSURL" \ + | jq --raw-output '.downloads[] | select(.name | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .urls.Linux[0].downloadId' + ) + echo "downloadid is $DOWNLOADID" + test -n "$DOWNLOADID" RESOLVEURL=$(curl \ --silent \ --header 'Host: www.blackmagicdesign.com' \ @@ -103,7 +109,7 @@ let --header 'Cookie: _ga=GA1.2.1849503966.1518103294; _gid=GA1.2.953840595.1518103294' \ --data-ascii "$REQJSON" \ --compressed \ - "$SITEURL") + "$SITEURL/$DOWNLOADID") curl \ --retry 3 --retry-delay 3 \ From c63eb5c260bbc101e833f7a3a9ef1df72010bdc3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 16 Sep 2023 22:08:18 -0400 Subject: [PATCH 24/63] davinci-resolve: fix missing version in meta See https://github.com/NixOS/nixpkgs/issues/253232 --- pkgs/applications/video/davinci-resolve/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index be940b0c3063..a74d7d2efd2c 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -179,7 +179,9 @@ let ); in buildFHSEnv { - name = davinci.pname; + inherit (davinci) pname version; + name = null; + targetPkgs = pkgs: with pkgs; [ alsa-lib aprutil From b01f295eb2a74216e162a5a2834e377c524aff8a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 23 Oct 2023 16:49:59 -0400 Subject: [PATCH 25/63] davinci-resolve: 18.6 -> 18.6.2 --- pkgs/applications/video/davinci-resolve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index a74d7d2efd2c..bc932b2e604d 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -31,7 +31,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6"; + version = "18.6.2"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -52,8 +52,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-QjjVb9IdZ1Vcyw/O3tP9cjxVTfRGC29tkp3KReyz63I=" - else "sha256-Rxe5ZiLpZbEf6yh7vdIrdjULqE8gyPRarMDDZiWwJCE="; + then "sha256-GlaTu52XzIy0gJDMvi9jQjeCMfhtOk8yLwDwspcB6rI=" + else "sha256-621CqN1XoiMFgfkuE7Vr4hE2QIC4F5A/wUPVaP5cScM="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From 304b1bd679990e76922162011137b8bd8588305d Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 16 Nov 2023 18:53:02 -0500 Subject: [PATCH 26/63] davinci-resolve: 18.6.2 -> 18.6.3 --- pkgs/applications/video/davinci-resolve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index bc932b2e604d..c7cd775ea7bf 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -31,7 +31,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6.2"; + version = "18.6.3"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -52,8 +52,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-GlaTu52XzIy0gJDMvi9jQjeCMfhtOk8yLwDwspcB6rI=" - else "sha256-621CqN1XoiMFgfkuE7Vr4hE2QIC4F5A/wUPVaP5cScM="; + then "sha256-OX8PyMhfl0jRdXBNsjlwkCAh8XUNJv8HEbmyAdjIv18=" + else "sha256-PNzdVxGgXIHM2vi3ChHx67TQBFlCYBOZCiFkDi/RSu4="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From f1361c508956058c5c7de49604cca4769bb45a49 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 16 Nov 2023 22:24:16 -0500 Subject: [PATCH 27/63] davinci-resolve: fix runtime error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/NixOS/nixpkgs/issues/265476 This is a hack that effectively undoes https://github.com/NixOS/nixpkgs/pull/263201 for just this derivation. Really we should probably be doing a ton of autoPatchelf or something to patch in our libs. Alas, this is “good enough” to un-break for now, I think. --- pkgs/applications/video/davinci-resolve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index c7cd775ea7bf..82f6f42ac0df 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -242,7 +242,7 @@ buildFHSEnv { '' export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb" export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH" - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32:${davinci}/libs ${davinci}/bin/resolve '' }"; From 4c87c27f5a977abcf9500e9a23860b5b23f0917a Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 25 Nov 2023 11:32:12 +0900 Subject: [PATCH 28/63] monitoring-plugins: fix path to ping in check_ping The path to ping was configured to use the wrapper prior to its removal [1]. This change removed the absolute path to ping/ping6 and added them to the binPath. Only the perl scripts use binPath, and now the C program `check_ping` fails to find the ping command. [1] See 759ec1113d0a1d6315b38bd83ec3562dacc08238 --- pkgs/servers/monitoring/plugins/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 2f6122caa69e..6f3d8c5ffd89 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -34,7 +34,6 @@ let lm_sensors net-snmp procps - unixtools.ping ]; mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } '' @@ -76,8 +75,8 @@ stdenv.mkDerivation rec { -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|' configureFlagsArray+=( - --with-ping-command='ping -4 -n -U -w %d -c %d %s' - --with-ping6-command='ping -6 -n -U -w %d -c %d %s' + --with-ping-command='${lib.getBin unixtools.ping}/bin/ping -4 -n -U -w %d -c %d %s' + --with-ping6-command='${lib.getBin unixtools.ping}/bin/ping -6 -n -U -w %d -c %d %s' ) install -Dm555 ${share} $out/share From df44acd7aae287caa0ca085fd36f14d1bda75ca2 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Tue, 14 Nov 2023 14:20:13 +0100 Subject: [PATCH 29/63] citrix_workspace: 23.07.0 -> 23.09.0 --- .../networking/remote/citrix-workspace/generic.nix | 10 +++++++++- .../networking/remote/citrix-workspace/sources.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 03d56274bd79..bf14b0321943 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -5,6 +5,7 @@ , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime +, libinput, libcap, libjson, libsecret, libcanberra-gtk3 , homepage, version, prefix, hash @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ${homepage} (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/workspace-app/ + https://www.citrix.com/downloads/workspace-app/) Once you have downloaded the file, please use the following command and re-run the installation: @@ -80,11 +81,16 @@ stdenv.mkDerivation rec { gtk_engines heimdal krb5 + libcap + libcanberra-gtk3 libcxx libcxxabi + libinput libjpeg + libjson libpng12 libpulseaudio + libsecret libsoup libvorbis libxml2 @@ -119,6 +125,8 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg.libxcb + xorg.xprop + xorg.xdpyinfo ]; installPhase = let diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 2422d7eb8efb..f1b1a83102ac 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -33,6 +33,17 @@ let x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59"; x64suffix = "17"; x86suffix = "17"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest21.html"; + }; + + "23.09.0" = { + major = "23"; + minor = "9"; + patch = "0"; + x64hash = "7b06339654aa27258d6dfa922828b43256e780b282d07109f452246c7aa27514"; + x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382"; + x64suffix = "24"; + x86suffix = "24"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3e5a64dc013..1b0a9cb2f77b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6879,8 +6879,9 @@ with pkgs; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_23_02_0 citrix_workspace_23_07_0 + citrix_workspace_23_09_0 ; - citrix_workspace = citrix_workspace_23_07_0; + citrix_workspace = citrix_workspace_23_09_0; clima = callPackage ../tools/text/clima { }; From 7fe9dab7d1a438e6899972a639974906886a1451 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Sun, 26 Nov 2023 19:58:38 +0100 Subject: [PATCH 30/63] owncast: 0.1.1 -> 0.1.2 --- pkgs/servers/owncast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index e5c0a8fbaf2b..0169a716e821 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -9,7 +9,7 @@ }: let - version = "0.1.1"; + version = "0.1.2"; in buildGoModule { pname = "owncast"; inherit version; @@ -17,9 +17,9 @@ in buildGoModule { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ="; + hash = "sha256-pPBY2PcXe3k9G6kjj/vF5VB6DEmiwKDUrK4VGR4xNzU="; }; - vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4="; + vendorHash = "sha256-7HxiZh5X5AZVMiZT6B8DfOy6stJ3+dFEixwJYv5X0dY="; propagatedBuildInputs = [ ffmpeg ]; From ca3463f32574bec9e3fd884a881f8ae521a38418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Nov 2023 11:09:57 -0800 Subject: [PATCH 31/63] python311Packages.pysyncthru: 0.7.10 -> 0.8.0 Diff: https://github.com/nielstron/pysyncthru/compare/release-0.7.10...0.8.0 Changelog: https://github.com/nielstron/pysyncthru/releases/tag/0.8.0 --- .../python-modules/pysyncthru/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index d5761bebee7f..568152605c77 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -1,33 +1,40 @@ { lib -, isPy27 , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , aiohttp , demjson3 -, python +, unittestCheckHook }: buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.10"; + version = "0.8.0"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + + pyproject = true; src = fetchFromGitHub { owner = "nielstron"; repo = "pysyncthru"; - rev = "release-${version}"; - sha256 = "1c29w2ldrnq0vxr9cfa2pjhwdvrpw393c84khgg2y56jrkbidq53"; + rev = "refs/tags/${version}"; + hash = "sha256-Zije1WzfgIU9pT0H7T/Mx+5gEBCsRgMLkfsa/KB0YtI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp demjson3 ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "pysyncthru" ]; From a2c3d00b7d645ebc0892a589983cc248c8532d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Nov 2023 11:48:29 -0800 Subject: [PATCH 32/63] python311Packages.pysignalclirestapi: 0.3.21 -> 0.3.22 Diff: https://github.com/bbernhard/pysignalclirestapi/compare/0.3.21...0.3.22 Changelog: https://github.com/bbernhard/pysignalclirestapi/releases/tag/0.3.22 --- .../development/python-modules/pysignalclirestapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix index 0e033ad99ff8..b3dd6f696006 100644 --- a/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.21"; + version = "0.3.22"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bbernhard"; repo = "pysignalclirestapi"; rev = version; - hash = "sha256-CAZ6UgGz7ZDXlQlngi+hEhczOphvAT/Yl9vLqnrS1Qc="; + hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU="; }; nativeBuildInputs = [ From fa18572934c3b635f23f18e7e29c0f14baeb4c57 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 Sep 2023 10:52:59 +0200 Subject: [PATCH 33/63] python310Packages.ipykernel: 6.25.2 -> 6.27.1 Changelog: https://github.com/ipython/ipykernel/releases/tag/v6.27.1 --- .../python-modules/ipykernel/default.nix | 10 +++++----- .../python-modules/ipykernel/tests.nix | 20 +++++++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 74cb52629af5..d1b970c34a2e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.25.2"; - format = "pyproject"; + version = "6.27.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws="; + hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index edbb13912ad9..0de6d2feb4ae 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -5,9 +5,10 @@ , flaky , ipykernel , ipyparallel -, nose +, pre-commit , pytestCheckHook - +, pytest-asyncio +, pytest-timeout }: buildPythonPackage { @@ -22,15 +23,26 @@ buildPythonPackage { flaky ipykernel ipyparallel - nose + pre-commit pytestCheckHook + pytest-asyncio + pytest-timeout ]; preCheck = '' export HOME=$(mktemp -d) ''; - disabledTests = lib.optionals stdenv.isDarwin ([ + disabledTests = [ # The follwing three tests fail for unclear reasons. + # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8 + "test_asyncio_interrupt" + + # DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel) + "test_embed_kernel_func" + + # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... + "test_install_kernelspec" + ] ++ lib.optionals stdenv.isDarwin ([ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" "test_subprocess_error" From 277bba75a9f3bf22ac265cb11efd81d5b84fcd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Nov 2023 08:08:45 -0800 Subject: [PATCH 34/63] python311Packages.aiosomecomfort: 0.0.22 -> 0.0.24 Diff: https://github.com/mkmer/AIOSomecomfort/compare/refs/tags/0.0.22...0.0.24 Changelog: https://github.com/mkmer/AIOSomecomfort/releases/tag/0.0.23 https://github.com/mkmer/AIOSomecomfort/releases/tag/0.0.24 --- pkgs/development/python-modules/aiosomecomfort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 5775aece8060..4e5c512a9e24 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.22"; + version = "0.0.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-d4pyt9+sBPNo/PL05HQ4sjyjubMtTZI9WUGRU1B/dH0="; + hash = "sha256-+kAObq8tbTO6Qlb+/93mF6K+gEHd33TofHug5f+zl+4="; }; nativeBuildInputs = [ From e02aed04efe5810d3a6d2730a9e05f7a8b8def79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Nov 2023 08:15:37 -0800 Subject: [PATCH 35/63] Revert "python3Packages.starline: 0.1.5 -> 0.2.0" This reverts commit 437c6150971ff08e0f4b26021e28c1edfafde571 because version 0.2.0 was yanked from PyPI. See https://github.com/Anonym-tsk/starline/issues/4. --- pkgs/development/python-modules/starline/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index ce7418a88734..4f4ad545f2df 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,21 +2,23 @@ , buildPythonPackage , pythonOlder , fetchPypi +, aiohttp , requests }: buildPythonPackage rec { pname = "starline"; - version = "0.2.0"; + version = "0.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6"; + sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9"; }; propagatedBuildInputs = [ + aiohttp requests ]; From 4bdb4b80496cf5f987db637ff56851fd5ea6703a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Nov 2023 08:25:03 -0800 Subject: [PATCH 36/63] python311Packages.starline: modernize expression --- .../python-modules/starline/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index 4f4ad545f2df..cdaca053ee1d 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , pythonOlder , fetchPypi -, aiohttp +, fetchpatch +, setuptools , requests }: @@ -12,13 +13,26 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; + pyproject = true; + src = fetchPypi { inherit pname version; - sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9"; + hash = "sha256-F1P1/NKml2rtd1r7A/g5IVnwQMZzkXzAxjRRDZXBPLk="; }; + patches = [ + # https://github.com/Anonym-tsk/starline/pull/5 + (fetchpatch { + url = "https://github.com/Anonym-tsk/starline/commit/4e6cdf8e05c5fb8509ee384e77b39a2495587160.patch"; + hash = "sha256-y9b6ePH3IEgmt3ALHQGwH102rlm4KfmH4oIoIC93cWU="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - aiohttp requests ]; From 9d619cb756cdf8839cca7fb450081ab318af3f88 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Nov 2023 04:20:00 +0000 Subject: [PATCH 37/63] grpc: 1.59.3 -> 1.60.0 Diff: https://github.com/grpc/grpc/compare/v1.59.3...v1.60.0 Changelog: https://github.com/grpc/grpc/releases/tag/v1.60.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 586dffd4262d..631bfa72b51a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.59.3"; # N.B: if you change this, please update: + version = "1.60.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-nsNaFshPlIt+B4Bw8djUqarI4mO/4YO8RcokCYibaaI="; + hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE="; fetchSubmodules = true; }; From f12eabdcbe642884b37cb5d20dbf781f998061f7 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 19 Oct 2023 20:26:01 +0200 Subject: [PATCH 38/63] nixos/screen: clean up --- .../manual/release-notes/rl-2405.section.md | 2 +- nixos/modules/programs/screen.nix | 38 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 6c697b580838..0351b12f56d9 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -8,7 +8,7 @@ In addition to numerous new and upgraded packages, this release has the followin -- Create the first release note entry in this section! +- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment. ## New Services {#sec-release-24.05-new-services} diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix index 68de9e52d7be..41bfb5d7809a 100644 --- a/nixos/modules/programs/screen.nix +++ b/nixos/modules/programs/screen.nix @@ -1,33 +1,41 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkOption mkIf types; cfg = config.programs.screen; in { - ###### interface - options = { programs.screen = { + enable = lib.mkEnableOption (lib.mdDoc "screen, a basic terminal multiplexer"); - screenrc = mkOption { - default = ""; - description = lib.mdDoc '' - The contents of /etc/screenrc file. + package = lib.mkPackageOptionMD pkgs "screen" { }; + + screenrc = lib.mkOption { + type = with lib.types; nullOr lines; + example = '' + defscrollback 10000 + startup_message off ''; - type = types.lines; + description = lib.mdDoc "The contents of {file}`/etc/screenrc` file"; }; }; }; - ###### implementation - - config = mkIf (cfg.screenrc != "") { - environment.etc.screenrc.text = cfg.screenrc; - - environment.systemPackages = [ pkgs.screen ]; + config = { + # TODO: Added in 24.05, remove before 24.11 + assertions = [ + { + assertion = cfg.screenrc != null -> cfg.enable; + message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true"; + } + ]; + } // lib.mkIf cfg.enable { + environment.etc.screenrc = { + enable = cfg.screenrc != null; + text = cfg.screenrc; + }; + environment.systemPackages = [ cfg.package ]; security.pam.services.screen = {}; }; - } From 33fde196fc4bb9322be132b284fae943fc1d135f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Dec 2023 04:20:00 +0000 Subject: [PATCH 39/63] gopass: 1.15.10 -> 1.15.11 Diff: https://github.com/gopasspw/gopass/compare/v1.15.10...v1.15.11 Changelog: https://github.com/gopasspw/gopass/blob/v1.15.11/CHANGELOG.md --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 10efc22d4a1b..6573c511474a 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.10"; + version = "1.15.11"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-6s4rg2+oC+RB2gE4FQIY2MPmFSh+RxiZxaIuMI/T8hE="; + hash = "sha256-wgrZkRRMEWA9Lk9eW+iGi+dZNYfDVhRu1phimZC079c="; }; - vendorHash = "sha256-tbZpNraGVC+p6O1MOh4vPmcwUgW5ykg7rGTNOWKFk0M="; + vendorHash = "sha256-TvohrwSFVv5ylVRd6jPdRDyRRhqqWa0xey9KN9vtyY8="; subPackages = [ "." ]; From c93d0831bfb02ea46c0be7cf449ea8b3d77411da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Dec 2023 04:20:00 +0000 Subject: [PATCH 40/63] gopass-jsonapi: 1.15.10 -> 1.15.11 Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.10...v1.15.11 Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.11/CHANGELOG.md --- pkgs/tools/security/gopass/jsonapi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 21345240a647..37ac46356c3a 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.10"; + version = "1.15.11"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-3E55MNS9QBLeae+Dc7NqbVMGie6NUKMBMGvkMqKeWoE="; + hash = "sha256-wJlnm+sgFg55LW4RWGjcT538DgNhJtFjwgwgqwLWH50="; }; - vendorHash = "sha256-sarNWeBi93oXL9v2EkP/z2+Bd4TyNy+z6576hOCf1/Q="; + vendorHash = "sha256-qRmPO2WM9RD43twl5a47IT3xC1LGFwNF99ojIU2xg6A="; subPackages = [ "." ]; From 1d4041a43297bcb10c3ab381b91bd23e3ce047b5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Dec 2023 04:20:00 +0000 Subject: [PATCH 41/63] gopass-summon-provider: 1.15.10 -> 1.15.11 Diff: https://github.com/gopasspw/gopass-summon-provider/compare/v1.15.10...v1.15.11 Changelog: https://github.com/gopasspw/gopass-summon-provider/blob/v1.15.11/CHANGELOG.md --- pkgs/tools/security/gopass/summon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index 48740f91954c..97aed94c05fe 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.10"; + version = "1.15.11"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-S4BPUl7KuRakHr2fvNobChfevFw1UAbAdpFUkwXcmxs="; + hash = "sha256-rbfzmr6HtGUBCjO9jkocSghTAN+aNXTsSsMC38HqgW0="; }; - vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA="; + vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw="; subPackages = [ "." ]; From 4e7e617d4e99863fa9c8362c48f44eb51f56cfdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Dec 2023 04:20:00 +0000 Subject: [PATCH 42/63] gopass-hibp: 1.15.10 -> 1.15.11 Diff: https://github.com/gopasspw/gopass-hibp/compare/v1.15.10...v1.15.11 Changelog: https://github.com/gopasspw/gopass-hibp/blob/v1.15.11/CHANGELOG.md --- pkgs/tools/security/gopass/hibp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 79a72bf891f8..11ee0a94dbf9 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.10"; + version = "1.15.11"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-v3FtWBi5H9LiFN/mowufonABr+aV3Z8MWBKiIUoy0NE="; + hash = "sha256-2XhvUIa8RxQ6CAKPGpL8/rBiJSX/WsSGtIpaHLIBM1E="; }; - vendorHash = "sha256-c4kk1RrvB+c+8IfbIsLRvG7O3cy+u9l+pDZ52XX1AhI="; + vendorHash = "sha256-i9PUqircNf+jz5gcr3rVIR4tD9/bkV2h6LiDFhjiLaw="; subPackages = [ "." ]; From d606011abb3ee87666012b812c3174ccd1b8aab0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 Dec 2023 04:20:00 +0000 Subject: [PATCH 43/63] git-credential-gopass: 1.15.10 -> 1.15.11 Diff: https://github.com/gopasspw/git-credential-gopass/compare/v1.15.10...v1.15.11 Changelog: https://github.com/gopasspw/git-credential-gopass/blob/v1.15.11/CHANGELOG.md --- pkgs/tools/security/gopass/git-credential.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 038cdaf84167..8654d05d9d13 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.10"; + version = "1.15.11"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-DQPjnCwpFOKN0ObPXPbwy7GK1VsPSj+pcLKjfSPPPRo="; + hash = "sha256-qnWgrpcj3DZQu5haP/5xqoO7eogkRjBmc8XpgFFNT6I="; }; - vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA="; + vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw="; subPackages = [ "." ]; From c5a39e6eda5d5ff5ad2c5c10611af5e8dc9804b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Dec 2023 10:33:34 +0000 Subject: [PATCH 44/63] nifi: 1.23.2 -> 1.24.0 --- pkgs/servers/web-apps/nifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 46535e0b4b4b..182b1fb22fd5 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.23.2"; + version = "1.24.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-NRX0lEE5/HsYnZXtLDlPUpgWMsg/2Z3cRUnJwKDGxfw="; + hash = "sha256-8S06E8RiH/EnfAa60eRzjmHmzMn+3UZbykJpvFFXEho="; }; nativeBuildInputs = [ makeWrapper ]; From 9dbe1b5b1f92da60d62aca53d863c81adce3e4bd Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 1 Dec 2023 11:50:00 +0100 Subject: [PATCH 45/63] got: 0.93 -> 0.94 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index f00ee82d1c2f..ee694403f294 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.93"; + version = "0.94"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-wlcnJr7f3Bd9SEgrKiPlr7pTSjaRj47qwktI2jepINE="; + hash = "sha256-hG0/a+sk6uZCxR908YfZCW44qx/SIwwGO9mUaxxHZ3k="; }; nativeBuildInputs = [ pkg-config bison ] From 370e76e66acb4d6ea3177afaf713462ff72db475 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:57:59 +0800 Subject: [PATCH 46/63] clipcat: 0.8.0 -> 0.9.0 Diff: https://github.com/xrelkd/clipcat/compare/v0.8.0...v0.9.0 --- pkgs/applications/misc/clipcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index c09d1f7e09ea..bec10a5a55e4 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-2Sh8VakHeAotdw1kkpRgNtLj1gnH1Ei7OC9INF/lkZo="; + hash = "sha256-P/8C+Gfmcuy7DGbH8+y6ZYlRrmV5t9U/uiykZ4bERSU="; }; - cargoHash = "sha256-cgyvIu56Ab3h6tgyQxtGsR0UPxgL65vb7fUAc0lMj5Q="; + cargoHash = "sha256-r2J5ysvLl7hKXfW+BIF15vBygUkuwNj222P1AckUu0E="; nativeBuildInputs = [ protobuf From df14c3d98b36a570121058cd545745ea0518babc Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Fri, 1 Dec 2023 15:40:07 +0100 Subject: [PATCH 47/63] upscayl: 2.9.1 -> 2.9.4 --- pkgs/applications/graphics/upscayl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index a892a0263a1e..1b6ea4857791 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.1"; + version = "2.9.4"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-x7tNGWXrg4hkr4d5QK4Z/cOmGGdbWLJ/GIASZjmiL4w="; + hash = "sha256-H9/z0NIqGGJPipioWvv67vIFQ46RZr5+ycm3NQrO9ZE="; }; appimageContents = appimageTools.extractType2 { From 7c7ba6877315b114adb8408cefb75799d88399ae Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Fri, 1 Dec 2023 13:02:59 -0500 Subject: [PATCH 48/63] nheko: Add meta.mainProgram Signed-off-by: Cynthia Fox --- .../applications/networking/instant-messengers/nheko/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index acc6f8948fc0..45c7e556a71d 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; + mainProgram = "nheko"; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: From c049b6a56e8c4cfd3af933fc05d46c9e47b0d9f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Dec 2023 18:48:46 +0000 Subject: [PATCH 49/63] opensearch: 2.11.0 -> 2.11.1 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 73eb1fd97fa7..3c09530d1790 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-j9bN09E4VikDPqvhRULfOjATme5KgVGrdv0rIPdd4Sw="; + hash = "sha256-km6z+Z9ZLnUY1dweJQrhHRu0XvdmqQIiqN8Ruy7jWpw="; }; nativeBuildInputs = [ From 339a90f30bf2777229f53ec08777df812a537187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 1 Dec 2023 20:16:08 +0100 Subject: [PATCH 50/63] wasmtime: 15.0.0 -> 15.0.1 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 3aa72be01392..8613beaef905 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "15.0.0"; + version = "15.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-oX8xhSyK7D5gFvgTJuXK59kcuYDa/9w25ndfwfhGPDE="; + hash = "sha256-9vArmudz1Avxz46IS9FZIKbs8wZXoeWMd/FGLmpPitw="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-cTQrC4xXgx6HMMq5TqGnFLhGAHGt57zKXp1Cc8jEX8Y="; + cargoHash = "sha256-/mX9zUN+dZoOCOPMeWCJ9U7KfI6JnFl8B2leYosy2jQ="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From ad4d73919b67ec8a66ea5b21e2fe714f828c9638 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Fri, 1 Dec 2023 20:37:42 +0100 Subject: [PATCH 51/63] polybar: 3.7.0 -> 3.7.1 --- pkgs/by-name/po/polybar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index ee649f396fa3..613b75d646af 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "polybar"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "polybar"; repo = "polybar"; rev = finalAttrs.version; - hash = "sha256-Z1rL9WvEZHr5M03s9KCJ6O6rNuaK7PpwUDaatYuCocI="; + hash = "sha256-DX648jY1vewl3ImK84gF6/vtcSCg3wtgq6Ie3fCwZoA="; fetchSubmodules = true; }; From e3bbde81e79652f77b63a5d64bb845b732349993 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Dec 2023 20:11:56 +0000 Subject: [PATCH 52/63] eks-node-viewer: 0.5.0 -> 0.6.0 --- .../networking/cluster/eks-node-viewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index 80538f0f111c..33c350b6bcb9 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kfX9BzARDWUOBIu67j60K38uwkRELxd/gXtEHOHAXS8="; + sha256 = "sha256-BK84hxbwZSJDO5WoyborJnVBS5pB69jTMU1csgiT0sw="; }; - vendorHash = "sha256-7axI7R8cTntc1IcOwVPmPj8MHeIvhbnkYKQdqu5fZOU="; + vendorHash = "sha256-EJAL5jNftA/g5H6WUMBJ98EyRp7QJ1C53EKr6GRz71I="; ldflags = [ "-s" From bd6bc36101404329ba7f500e94e56b9cd65b82bb Mon Sep 17 00:00:00 2001 From: Ross Light Date: Fri, 1 Dec 2023 12:14:00 -0800 Subject: [PATCH 53/63] gg-scm: 1.3.0 -> 1.3.1 Release notes: https://github.com/gg-scm/gg/blob/main/CHANGELOG.md#131---2023-12-01 --- pkgs/applications/version-management/gg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index ea701c6f07b3..279e6d0075e7 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -10,8 +10,8 @@ }: let - version = "1.3.0"; - commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f"; + version = "1.3.1"; + commit = "b6be8bac78605c21a9670db0e44faf5e1eafe0d4"; in buildGoModule { pname = "gg-scm"; inherit version; @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8="; + hash = "sha256-qw0KWhCkJVYRhDBNtiNactWGGMHjBwdQ1Po4lQQbaj4="; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ @@ -33,7 +33,7 @@ in buildGoModule { "-X" "main.buildCommit=${commit}" ]; - vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU="; + vendorHash = "sha256-56Sah030xbWsoOu8r3c3nN2UGHvQORheavebP+Z1Wc8="; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; nativeCheckInputs = [ bash coreutils git ]; From 246a164a436043e8ad572ef26283c5604828d48f Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 2 Dec 2023 07:54:22 +1000 Subject: [PATCH 54/63] bruno: 1.2.0 -> 1.3.0 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 66d5126c5f31..9be7b663d4f3 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-60YwXAukGnMiaYxVOcUgGa/r/If1pJC6pMyyltTfd1c="; + hash = "sha256-E9aVyZWqY8XTwoUbHaj8VM32Eex7GNQcEpg8Hkk2O0U="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; From 3e3b6b14950a50949803378869dde692eef118f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 1 Dec 2023 14:24:36 -0800 Subject: [PATCH 55/63] python311Packages.flask-themes2: 1.0.0 -> 1.0.1 --- .../python-modules/flask-themes2/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask-themes2/default.nix b/pkgs/development/python-modules/flask-themes2/default.nix index 56c03ca39e0c..b4cd08bdcf09 100644 --- a/pkgs/development/python-modules/flask-themes2/default.nix +++ b/pkgs/development/python-modules/flask-themes2/default.nix @@ -1,20 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, flask +, pytestCheckHook +}: buildPythonPackage rec { pname = "flask-themes2"; - version = "1.0.0"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Flask-Themes2"; inherit version; - hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8="; + hash = "sha256-gsMgQQXjhDfQRhm7H0kBy8jKxd75WY+PhHR6Rk/PUPs="; }; - nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ flask ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Easily theme your Flask app"; From db19573eeb621101e5cc52c90dd91f1967f894a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Dec 2023 01:28:06 +0000 Subject: [PATCH 56/63] kodiPackages.pvr-hts: 20.6.4 -> 20.6.5 --- pkgs/applications/video/kodi/addons/pvr-hts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index a3b2e81fa686..16c1520fc5f0 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "20.6.4"; + version = "20.6.5"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg="; + sha256 = "sha256-NrSLWZn+aeWUKxM/ETvoE4gRo4JZsD1snpLvMLDlpFw="; }; meta = with lib; { From 4c17c83b2722524bc868239f085b5c69053ae18c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Dec 2023 04:20:00 +0000 Subject: [PATCH 57/63] buildkit: 0.12.3 -> 0.12.4 Diff: https://github.com/moby/buildkit/compare/v0.12.3...v0.12.4 Changelog: https://github.com/moby/buildkit/releases/tag/v0.12.4 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 41843024a515..8898ff89f371 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-ph44J90g5zOTi/+FVbdnDDJp1gXcxPt7coA1rvhsQSQ="; + hash = "sha256-nQvrd2W9xWWGTlwN5Q2E3rs67OUxZ4bIp+rK2W2PUww="; }; vendorHash = null; From 8339ce0e0f64fffac08b35c0d74c0eab5112d468 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Dec 2023 04:20:00 +0000 Subject: [PATCH 58/63] flow: 0.222.0 -> 0.223.2 Diff: https://github.com/facebook/flow/compare/v0.222.0...v0.223.2 Changelog: https://github.com/facebook/flow/blob/v0.223.2/Changelog.md --- pkgs/development/tools/analysis/flow/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 6ed8c18d0b1a..3b6b24f327d3 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.222.0"; + version = "0.223.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-IOy6zsDGUfiSeOalQnku/4uNyjqpz2bMcpmf7Vq9fyI="; + hash = "sha256-vjsqQuQxTywSx4c0lnDKrrNr5hfFog9UurhIctq14f4="; }; postPatch = '' @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { makeFlags = [ "FLOW_RELEASE=1" ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + installPhase = '' install -Dm755 bin/flow $out/bin/flow install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow From d00d51e45129abc69a22ffdb733cb630f3ee3765 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:01:45 +0100 Subject: [PATCH 59/63] luaPackages.luasnip: init at 2.1.1-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 78cfca24d96b..c0f416edcb9e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -73,6 +73,7 @@ luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, luarocks-build-rust-mlua,,,,,,mrcjkb luasec,,,,,,flosse +luasnip,,,,,, luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fcde2f41ddce..0bd4d885504e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2183,6 +2183,29 @@ buildLuarocksPackage { }; }) {}; +luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }: +buildLuarocksPackage { + pname = "luasnip"; + version = "2.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasnip-2.1.1-1.rockspec"; + sha256 = "1jrdai8qsanr6x2vqp70hipsxrxh0abvwr2xwh9p4wr29k4wyycb"; + }).outPath; + src = fetchzip { + url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.1.1.zip"; + sha256 = "0mbpwf3sxfrmrza13d9w0hlcmzlrj551g332syp1qhs94abfnnrd"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ jsregexp lua ]; + + meta = { + homepage = "https://github.com/L3MON4D3/LuaSnip"; + description = "Snippet Engine for Neovim written in Lua."; + license.fullName = "Apache-2.0"; + }; +}) {}; + luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; From 8293f1a4bc7c47cb4cafa88afbb30b3e05310055 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"886074+teto@users.noreply.github.com"> Date: Sat, 2 Dec 2023 11:45:48 +0100 Subject: [PATCH 60/63] vimPlugins: update on 2023-12-02 --- .../editors/vim/plugins/generated.nix | 208 +++++++++--------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 1083aa39ee20..5eab8dba6176 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "3fc2c956d99216b2816f07d2b946020ba2e02457"; - sha256 = "1hv712cn3vn4gnr01a9maq787nb13x8nwachksnik49bq28g43g6"; + rev = "e8ac7f1a9a3973ecce6942b2f26d16e65902aa70"; + sha256 = "127shx9vzq9rkjk44xpr24w76b51fywwrni6nvrdq29swqdpk9yw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2348,12 +2348,12 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "3665ed0f3ef3ad68673df7195789d134d0d1fdb0"; - sha256 = "1vsyjxqzq57ckmj942i018r1zg56l908fg8i5z3rv4qyqrwjz725"; + rev = "38a41d0d78f8823cc144c99784528b9a68bdd608"; + sha256 = "05v2cxa10s98pk7w0g3g8p440bz6n2r2k4ygxz9vkbcjf39kgjaj"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2480,12 +2480,12 @@ final: prev: csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2023-09-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "4fd88346aed02123aa5daa1a363868a576c6fdcf"; - sha256 = "10c2hgzhnv1zr461hvp4cnxpfs0aja43whjimdsb5sjd4xk5x7cc"; + rev = "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b"; + sha256 = "11gwamrqqmcy5jvbmnmyvx94pknlx3ppvyk4b6vhm4dghwmhq9nb"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -3046,12 +3046,12 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-11-07"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "fe3071330a0720ce3695ac915820c8134b22d1b0"; - sha256 = "0a76mkvgya5hygfjbk2wbha18fhwhv6kmkxgvda053z325505mc6"; + rev = "8b7ae53d7f04f33be3439a441db8071c96092d19"; + sha256 = "1gj3apvif9bfz1vqrxr6xmj5p7byjq5qdjv159lnm09hca3vfdnb"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -3649,12 +3649,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "474af4d6e2f0ebfbb5df85ca7827b67949717bae"; - sha256 = "0236ccalzkwv2qzspqdglnkvpflzcppllp4v5bn6v1lbnlyqj7dm"; + rev = "a1a2d0f42eaec400cc6918a8e898fc1f9c4dbc5f"; + sha256 = "14pdspy8932fh5w247vqs0fyywb6mwg1af9sk5irgxfsv7c0xlg2"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3877,12 +3877,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "e0528b5868b8c488fb6eaf1a4f7b298976d419a5"; - sha256 = "08xh4i09akm13gaj5zzlqlhcrr1i21jwqzxljf7i5wklpw7hf03c"; + rev = "7b7c20029a817ef51f6b498388488e9850fe45ac"; + sha256 = "0qbgmg9kvhxz4akmxd56lwr2zjxrayccgiynkcfnqakvya271jji"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4080,24 +4080,24 @@ final: prev: harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-10-10"; + version = "2023-12-02"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a"; - sha256 = "0wqxg31z7gi7ap8r0057lpadywx3d245ghlljr6mkmp0jz3waad5"; + rev = "c5f2d71c32a4aa2569bef1066e668947b78f9682"; + sha256 = "1jn3sj3r1mczg5wyh7qcs51mab8sz02sgff5d2p3qhz0gjvyq22m"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-26"; + version = "2023-12-02"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "8bfbba643d908e8757d591cf01e2241dd46b0858"; - sha256 = "05np6ahzf6mk6ksfak12y7iwgfkrpkwhgf366bqlbk236g3k7sk0"; + rev = "fdb248c2cc724b151b0886044b5fd8b88968d0d1"; + sha256 = "0wj9aqihym10bmdybdmvlf8nlaghhfxl5z7gaamzbzlwhwlx71zy"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2023-10-20"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "eb5531b5f6285656408d1ed07b4d9bcc8067bad4"; - sha256 = "0yl1l11dp58mg3bfk42ydcc7s2fxnnz6nlkkc09kxmdf4gxwr3wc"; + rev = "05d9325e14ee1af9114b5c4586d1b200e75ccac9"; + sha256 = "1ffhx1i9p7a13k6qmpry507ypk45sff6api5nnnc709bd7360743"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4439,12 +4439,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-10-30"; + version = "2023-12-02"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "29be0919b91fb59eca9e90690d76014233392bef"; - sha256 = "0z8n9d6f4qiq8m4ai1r2xz90955cp6cikqprq74ivfch3icrzdi1"; + rev = "dbd90bb689ff10d21fee6792eb8928f0584b5860"; + sha256 = "1fbx8l5m09qyis4d767gmmwa9rgify6vwjvj3b1jqfzhlz1fmd24"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4860,12 +4860,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2023-10-22"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c"; - sha256 = "19nffffmczlqfsgjs10hqs9abgbygiv0ns64apk7gzf5anjaj0z1"; + rev = "d55acc28ecc1f3ab3c396afd1f8b11a239285d9b"; + sha256 = "0g4savdihdh15lddh5yj8vq5py9flzl59dqc93w6yx2kvj1r9ad2"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5016,12 +5016,12 @@ final: prev: lightspeed-nvim = buildVimPlugin { pname = "lightspeed.nvim"; - version = "2022-10-21"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "299eefa6a9e2d881f1194587c573dad619fdb96f"; - sha256 = "1697plp2f6r5vmayi4xw23lj69pc31r3zh3p07rzxgl2ir4zrj1z"; + rev = "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05"; + sha256 = "1006047i88h1sad2xdi6h26vy13wnh4mnsdqqp4gpvh2sg6avnd5"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -5279,12 +5279,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-21"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "d3dfaea0125315110ea720c337ab88aa451d75e7"; - sha256 = "07bm8gvzx68cdy7jkhva3caqjqazrh5hnhr3yi1qa6g1vlmnb0f7"; + rev = "e9f08958e5f8410cadaa6388844788aedec5f78a"; + sha256 = "1rhrjh36nlwrms9ikd3vfmvf1lh5m8wqx79n82g68lkaxch6g8v1"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5325,14 +5325,14 @@ final: prev: meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; - luasnip = buildVimPlugin { + luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1def35377854535bb3b0f4cc7a33c083cdb12571"; - sha256 = "1g34ivzymgv214rpmwcmv91l4gp29q4r6cbv8xszzvxmc7dxcgkr"; + rev = "118263867197a111717b5f13d954cd1ab8124387"; + sha256 = "05gf35zb1m4baz3xiw8qh647l2w89861jljrhbbjnhnn48vfqgzw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5436,24 +5436,24 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "41674c9d50f23cfa3e11f0ca964eb9100c2a8922"; - sha256 = "030vyd0n45kd9j33kb20v8kx9pg66702525gnjbcrv5a8npldm1q"; + rev = "4eb8e15e3c0757303d4c6dea64d2981fc679e990"; + sha256 = "0ng3zhxcxdkpwd4zy17yl51h7bhknd3qv8j6rkbq1js237zv027p"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2023-10-10"; + version = "2023-12-02"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "e4f34741daa9cf95de68a603d3e7a6844a69fdf0"; - sha256 = "1pk19mlssn6f4pqm2j0kf9841nmxd0scphhrrd02w81gmsr912zh"; + rev = "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74"; + sha256 = "1jxk8hz4p84f725f35hdkqnk6dnkanly86k89n7p551qwjs21mv0"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; @@ -5556,12 +5556,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "964fab7fecd14f66a69a96162f8aa816480690fd"; - sha256 = "1vxbjidpxhjbrbhg5kl4x4dcsn77nfybzbnlq4yjcpcsrmf8ms5i"; + rev = "6d1cbcaec421b3768088b4047e78ce22e5503b99"; + sha256 = "1924d432sym9qbp2q9h9gj5ky81vnxq1y4zzfrg5ay76clplaa95"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6036,12 +6036,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "1ab1504ab87016e1d12b8f23543532a3006adb3b"; - sha256 = "147k8rxcqqp85l1mjklak0bfzbwn2gkxkm4ykw01srkzy5jlhdwp"; + rev = "d0e87541130b2cf62d7f8a54487ef99560232fb6"; + sha256 = "16mmrhn83k8jrjavxbzq5ql32q2c9jqdgfx3a6hd2iv810y664qi"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6108,12 +6108,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "f4466457396717d10d2d235d019e0a80e1770087"; - sha256 = "07gs0hdgy7q5sq3cj29jc8qlwsjmr74hqgy0l38pljbqxajigsww"; + rev = "bf3daa2229c60f92f48ac6d7db3049b65fd01371"; + sha256 = "0si90zng5x0p6qcrzzib8gifbxxw3m3sqbh22jiwwdjxwr3vhy9d"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6445,12 +6445,12 @@ final: prev: nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-11-15"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "0cb04e9245b000daf32f04aae5f606011a6aa3b5"; - sha256 = "1rws27wc2l3qahvbfd5b2i1js9kwldxxsfsn0abah96q2m1i3q85"; + rev = "50a394b2bfa93674381cb913d6330e5075b5c787"; + sha256 = "1p8qmnbi3l4y743db35sig5nxgqj83s20yyqhld9b5v0yr27rhbl"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6589,12 +6589,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-11-29"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "0311b1654098b28c29a99007844dfa4bfe315b0a"; - sha256 = "01rx8pf5qkga3x4y9902pwkjh0xifgba4xk6wfr0akn1slwd1g11"; + rev = "968ad52ee472e950d104303c4c0bfcd3de664fe1"; + sha256 = "0lqhi74fjvsflx642g04k2zf8i8dxfycmgd7hh0nkc6012b1ma3x"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -6613,12 +6613,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-11-29"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "3a4826687da4310af379515086d71faca4d21288"; - sha256 = "1fcln8z31cmmg0dclp8gwiy74pfa4ylic74pdf4mcsaqbm5blkr4"; + rev = "7bf88cd3b37a411fdacfdca1745408a77a420493"; + sha256 = "0ynlhj5vskv6laixs79lh334fxxkm0yx1vcgc9vyk9cr19v5109n"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7236,12 +7236,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "fcf153fbbf1facd16a71d46b92be8be495123a9f"; - sha256 = "13h9nx74afvabrn51b4wjb6k6svidbmwq5czl03p3rp37lywkxcw"; + rev = "694aaec65733e2d54d393abf80e526f86726c988"; + sha256 = "16nrq7gxnk33qgpmcnjd8yq738vd7qpr2x77v7xf84qp2443nbkx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7464,12 +7464,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "1b11329ece4cd25884b56c129aedc23ff1665d92"; - sha256 = "0n7mqssagmq40glaiybmf8d5664665q32d9kbgz00jgnnj9n93ay"; + rev = "7eb9030662fad8bfbc1df2c6cfc165aa4a8904b2"; + sha256 = "1245qk1s00svnh57ijamziam8lm3d419a5vf3wry9fdf2lm01j1g"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7596,12 +7596,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b41bbcbb9a2c5543d3bfa4cf7e2b0948a5f61ce6"; - sha256 = "1nsfxaxi2wkbs32kfxsbd23m2xx0fickffjgcprj079bgl64z47k"; + rev = "80a16deb5146a3eb4648effccda1ab9f45e43e76"; + sha256 = "0mgm5b80flk5171b3b2gsy2pjdimc0xbjbsdg4qf9hgzjyxf9jmi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7656,12 +7656,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "aa7935c60aff501580b7f4872a7082e615ea5be3"; - sha256 = "0j9fv564l4k1jf29h0mb5vnm2h1x3balrpnmchav527ylcaxhgmm"; + rev = "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a"; + sha256 = "1kdfwihk8ci827aq4w6xv7vn2740qpmh6dk892cd6yi0ab4zxvxn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7727,12 +7727,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "c1e75fb93a5413c73221e23d549cc9f208d592fb"; - sha256 = "0kwxqrbb0n12bq3iqidk8i67ag4g6rdnqzk5gcjjvm6qlvvylggz"; + rev = "47a2f8d4da670db6e01a7373cdf97249e332d6d4"; + sha256 = "0k2l5ls9fhc53a7fvyz8p75n0b3spy7s3j4z9l3ilzvhd6m7al6d"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7871,12 +7871,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-24"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "e89a8f8adeef2dfab851fd056d38ee7afc97c249"; - sha256 = "1f5201yb7kqbggn0dgpl9p5mnxdxg6ffpfmzih7rzzkp4fhn2vb4"; + rev = "58340545c6a01e5e9f7966df448714a156db137a"; + sha256 = "0s3yd9336yqk8s8f07lf0195pn5q0ij1qphp0yaisrpxbfarl63p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8774,12 +8774,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-28"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "bdd7155a18249f39a014115a8832ee770e503812"; - sha256 = "0abwc7shfqcr31m7gaaxq07ym24s6gz8mkc49f5j0idcfj4k4n1v"; + rev = "3cad6912b16d5e0a5375d465ca28fda4c6ea4ee9"; + sha256 = "12lzw6jh7z5bvd7ss9xils11paiv3b9by31nlxfarnpcvqf0m9l4"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8875,7 +8875,7 @@ final: prev: owner = "VonHeikemen"; repo = "searchbox.nvim"; rev = "110949af8963185b4e732b45ae57beb731bfcede"; - sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7"; + sha256 = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU="; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -9256,12 +9256,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-11-13"; + version = "2023-12-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "ffe6b8e975bb2f218cbeb3e785d2f12d9f88b37d"; - sha256 = "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr"; + rev = "e605292319d9c964281d840ac87d3deddfc06559"; + sha256 = "0b5zj2ilvhkv01n480gd6zylnhc3yhq9p7gcj0f12fn9yfihqdnf"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9848,12 +9848,12 @@ final: prev: telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2023-11-06"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "5460c6c60d48618c5c746e5b1cad4c3e8262fdae"; - sha256 = "0mj5sg698idk6lsaw6fd56j206vf0djv5sgaszjm4vffgc7666sb"; + rev = "1aaf16580a614601a7f7077d9639aeb457dc5559"; + sha256 = "1g03lnl79245d0vn7ydda4aixd2qbv9kcxc584msk7jwbc58r2xn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -10077,12 +10077,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "1680642717be198d5b16fc4de9b8080d77111270"; - sha256 = "1hi1j2xnbqy0zmm06zfgwmikl6hphgkhbnhvdagap9h4nifpn9vz"; + rev = "8f22e5fcbb8d591e04fa3e9780e2e16809278f9f"; + sha256 = "0gpmfvj26kcm8ii9fhjgpwh5c571hy7xb253qq1vaak9cxa9m9yh"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10438,12 +10438,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-30"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "d56c7c469b52448164d078e26802b2e3071b17b0"; - sha256 = "1xflz3f5qm5injgzag7c4l2k4pflhv4knd5gpsxryzyxizlxkadl"; + rev = "ebf9874e64a8c96041af727d2aa17033a8718f03"; + sha256 = "1ndm54q3qg2hhcnh1bncjpmknczmngy9n6jgbr2wrxsvrsq8mb06"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12888,12 +12888,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-11-16"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a"; - sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph"; + rev = "90e299ec91fa8ff88f73150f824f77f86b0f867e"; + sha256 = "03kk30lskwhq5d1jmyhfws74l0iayrvsk7v0ki93k099k1fv5n7m"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; From 81b362f89ae04c4696f0ddabc268efe0243794cb Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"886074+teto@users.noreply.github.com"> Date: Sat, 2 Dec 2023 12:02:30 +0100 Subject: [PATCH 61/63] vimPlugins.nvim-treesitter: update grammars --- .../editors/vim/plugins/nvim-treesitter/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index b58346340309..60395d8b3020 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1921,12 +1921,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=192eda4"; + version = "0.0.0+rev=23c69a4"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "192eda46774fd0281cdd41d372d5b4da86148780"; - hash = "sha256-Bxgh7K3j0oPvZw7JX3kXFmaEAEKefB0A9ATmrbvXrB8="; + rev = "23c69a4fa9803abc9d87b235ca88d52418250041"; + hash = "sha256-tdxx+feI0UIHkk1eS5VrIuYvOZWpuWF3NEioqrnZ+30="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; From 28517a7a6b8e0c7803a2fe18ccd3be574d65a43e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Dec 2023 03:24:20 +0000 Subject: [PATCH 62/63] python310Packages.faster-whisper: 0.9.0 -> 0.10.0 https://github.com/SYSTRAN/faster-whisper/releases/tag/0.10.0 --- .../python-modules/faster-whisper/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 30f2174ff7da..84761c3bfa06 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,21 +15,16 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; - rev = "refs/tags/v${version}"; - hash = "sha256-kHXX5Z4r7+lFRBtTCsPy9DILwsk3T1mcBzmJnCrKTdk="; + rev = "refs/tags/${version}"; + hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "onnxruntime>=1.14,<2" "onnxruntime" - ''; - propagatedBuildInputs = [ av ctranslate2 @@ -54,7 +49,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/v${version}"; + changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}"; description = "Faster Whisper transcription with CTranslate2"; homepage = "https://github.com/guillaumekln/faster-whisper"; license = licenses.mit; From 6a5fcd063ecc08198e8a634a390474ea19516573 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Dec 2023 07:54:38 +0000 Subject: [PATCH 63/63] python310Packages.fschat: 0.2.32 -> 0.2.33 --- pkgs/development/python-modules/fschat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index 573009b2a5ea..44420ae6c61f 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -29,7 +29,7 @@ , protobuf }: let - version = "0.2.32"; + version = "0.2.33"; in buildPythonPackage { pname = "fschat"; @@ -40,7 +40,7 @@ buildPythonPackage { owner = "lm-sys"; repo = "FastChat"; rev = "refs/tags/v${version}"; - hash = "sha256-3IJcqVULOK0Nf72sgv80q9U8QZ3pNHLYaNwCQohdBB8="; + hash = "sha256-tfFgiYJBuVt71qHOmkDoSrZ2tvXStjubmkw7sexkGZg="; }; nativeBuildInputs = [