diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix index a211bd8eaefe..e081bd0ade2c 100644 --- a/pkgs/by-name/ap/apftool-rs/package.nix +++ b/pkgs/by-name/ap/apftool-rs/package.nix @@ -4,18 +4,18 @@ rustPlatform, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "apftool-rs"; - version = "0-unstable-2024-01-05"; + version = "1.2.3"; src = fetchFromGitHub { owner = "suyulin"; repo = "apftool-rs"; - rev = "92d8a1b88cb79a53f9e4a70fecee481710d3565b"; - hash = "sha256-0+eKxaLKZBRLdydXxUbifFfFncAbthUn7AB8QieWaXM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bcXZIY0CDyWE3vh04IU3kXRxi/uUm5TD8ifA0jq47rc="; }; - cargoHash = "sha256-IJEEnNIW44kItB19U1lNGi1cHpVGaGHQZt2kgAJFkjU="; + cargoHash = "sha256-Ufe82fJALRlMjRSQ7Y2wFTOzXKtuwQyrWfxZjdEtuc0="; meta = { description = "About Tools for Rockchip image unpack tool"; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ colemickens ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix deleted file mode 100644 index 050575366276..000000000000 --- a/pkgs/by-name/go/gobang/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: -let - version = "0.1.0-alpha.5"; -in -rustPlatform.buildRustPackage { - pname = "gobang"; - inherit version; - - src = fetchFromGitHub { - owner = "tako8ki"; - repo = "gobang"; - rev = "v${version}"; - hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak="; - }; - - cargoPatches = [ ./update-sqlx.patch ]; - - cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; - - meta = { - description = "Cross-platform TUI database management tool written in Rust"; - homepage = "https://github.com/tako8ki/gobang"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/go/gobang/update-sqlx.patch b/pkgs/by-name/go/gobang/update-sqlx.patch deleted file mode 100644 index 1571b00f0339..000000000000 --- a/pkgs/by-name/go/gobang/update-sqlx.patch +++ /dev/null @@ -1,1553 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 6cf1c13..c3ea64b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4,24 +4,15 @@ version = 3 - - [[package]] - name = "ahash" --version = "0.7.4" -+version = "0.7.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" - dependencies = [ - "getrandom", - "once_cell", - "version_check", - ] - --[[package]] --name = "aho-corasick" --version = "0.7.18" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" --dependencies = [ -- "memchr", --] -- - [[package]] - name = "ansi_term" - version = "0.11.0" -@@ -39,9 +30,9 @@ checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" - - [[package]] - name = "arrayvec" --version = "0.5.2" -+version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - - [[package]] - name = "async-trait" -@@ -51,7 +42,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -74,12 +65,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "autocfg" --version = "0.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -- - [[package]] - name = "autocfg" - version = "1.0.1" -@@ -92,31 +77,70 @@ version = "0.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -+[[package]] -+name = "base64ct" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -+ - [[package]] - name = "bitflags" --version = "1.2.1" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] --name = "bitvec" --version = "0.19.5" -+name = "block-buffer" -+version = "0.10.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" - dependencies = [ -- "funty", -- "radium", -- "tap", -- "wyz", -+ "generic-array", - ] - - [[package]] --name = "block-buffer" --version = "0.9.0" -+name = "borsh" -+version = "0.10.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" - dependencies = [ -- "generic-array", -+ "borsh-derive", -+ "hashbrown 0.11.2", -+] -+ -+[[package]] -+name = "borsh-derive" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -+dependencies = [ -+ "borsh-derive-internal", -+ "borsh-schema-derive-internal", -+ "proc-macro-crate", -+ "proc-macro2", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "borsh-derive-internal" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", -+] -+ -+[[package]] -+name = "borsh-schema-derive-internal" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", - ] - - [[package]] -@@ -125,6 +149,28 @@ version = "3.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" - -+[[package]] -+name = "bytecheck" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -+dependencies = [ -+ "bytecheck_derive", -+ "ptr_meta", -+ "simdutf8", -+] -+ -+[[package]] -+name = "bytecheck_derive" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", -+] -+ - [[package]] - name = "byteorder" - version = "1.4.3" -@@ -184,22 +230,18 @@ dependencies = [ - ] - - [[package]] --name = "cpufeatures" --version = "0.1.5" -+name = "const-oid" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" --dependencies = [ -- "libc", --] -+checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - - [[package]] --name = "crossbeam-channel" --version = "0.5.1" -+name = "cpufeatures" -+version = "0.2.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" - dependencies = [ -- "cfg-if", -- "crossbeam-utils", -+ "libc", - ] - - [[package]] -@@ -273,15 +315,25 @@ dependencies = [ - ] - - [[package]] --name = "crypto-mac" --version = "0.10.1" -+name = "crypto-bigint" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -+checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" - dependencies = [ - "generic-array", - "subtle", - ] - -+[[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 = "database-tree" - version = "0.1.0-alpha.5" -@@ -291,20 +343,33 @@ dependencies = [ - "thiserror", - ] - -+[[package]] -+name = "der" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -+dependencies = [ -+ "const-oid", -+ "crypto-bigint", -+ "pem-rfc7468", -+] -+ - [[package]] - name = "digest" --version = "0.9.0" -+version = "0.10.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" - dependencies = [ -- "generic-array", -+ "block-buffer", -+ "crypto-common", -+ "subtle", - ] - - [[package]] - name = "dirs" --version = "3.0.2" -+version = "4.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" - dependencies = [ - "dirs-sys", - ] -@@ -359,6 +424,24 @@ version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -+[[package]] -+name = "event-listener" -+version = "2.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -+ -+[[package]] -+name = "flume" -+version = "0.10.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+ "pin-project", -+ "spin 0.9.8", -+] -+ - [[package]] - name = "form_urlencoded" - version = "1.0.1" -@@ -369,12 +452,6 @@ dependencies = [ - "percent-encoding", - ] - --[[package]] --name = "funty" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -- - [[package]] - name = "futures" - version = "0.3.15" -@@ -392,9 +469,9 @@ dependencies = [ - - [[package]] - name = "futures-channel" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" -+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" - dependencies = [ - "futures-core", - "futures-sink", -@@ -402,15 +479,15 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" -+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - - [[package]] - name = "futures-executor" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" -+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" - dependencies = [ - "futures-core", - "futures-task", -@@ -430,42 +507,39 @@ dependencies = [ - - [[package]] - name = "futures-io" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" -+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - - [[package]] - name = "futures-macro" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" -+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" - dependencies = [ -- "autocfg 1.0.1", -- "proc-macro-hack", - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.65", - ] - - [[package]] - name = "futures-sink" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" -+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - - [[package]] - name = "futures-task" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" -+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - - [[package]] - name = "futures-util" --version = "0.3.15" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" -+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" - dependencies = [ -- "autocfg 1.0.1", - "futures-channel", - "futures-core", - "futures-io", -@@ -475,8 +549,6 @@ dependencies = [ - "memchr", - "pin-project-lite", - "pin-utils", -- "proc-macro-hack", -- "proc-macro-nested", - "slab", - ] - -@@ -523,7 +595,7 @@ dependencies = [ - "strum", - "strum_macros", - "tokio", -- "toml", -+ "toml 0.4.10", - "tui", - "unicode-width", - "which", -@@ -538,13 +610,22 @@ dependencies = [ - "ahash", - ] - -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+dependencies = [ -+ "ahash", -+] -+ - [[package]] - name = "hashlink" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" - dependencies = [ -- "hashbrown", -+ "hashbrown 0.11.2", - ] - - [[package]] -@@ -556,6 +637,15 @@ dependencies = [ - "unicode-segmentation", - ] - -+[[package]] -+name = "heck" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -+dependencies = [ -+ "unicode-segmentation", -+] -+ - [[package]] - name = "hermit-abi" - version = "0.1.18" -@@ -571,13 +661,21 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -+[[package]] -+name = "hkdf" -+version = "0.12.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -+dependencies = [ -+ "hmac", -+] -+ - [[package]] - name = "hmac" --version = "0.10.1" -+version = "0.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" - dependencies = [ -- "crypto-mac", - "digest", - ] - -@@ -598,8 +696,8 @@ version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" - dependencies = [ -- "autocfg 1.0.1", -- "hashbrown", -+ "autocfg", -+ "hashbrown 0.11.2", - ] - - [[package]] -@@ -622,9 +720,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "0.4.7" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -641,27 +739,14 @@ version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - dependencies = [ -- "spin", --] -- --[[package]] --name = "lexical-core" --version = "0.7.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" --dependencies = [ -- "arrayvec", -- "bitflags", -- "cfg-if", -- "ryu", -- "static_assertions", -+ "spin 0.5.2", - ] - - [[package]] - name = "libc" --version = "0.2.97" -+version = "0.2.155" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" -+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - - [[package]] - name = "libm" -@@ -671,9 +756,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - - [[package]] - name = "libsqlite3-sys" --version = "0.22.2" -+version = "0.24.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" -+checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" - dependencies = [ - "cc", - "pkg-config", -@@ -698,12 +783,6 @@ dependencies = [ - "cfg-if", - ] - --[[package]] --name = "maplit" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -- - [[package]] - name = "matches" - version = "0.1.8" -@@ -712,20 +791,25 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "md-5" --version = "0.9.1" -+version = "0.10.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" - dependencies = [ -- "block-buffer", -+ "cfg-if", - "digest", -- "opaque-debug", - ] - - [[package]] - name = "memchr" --version = "2.4.0" -+version = "2.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" -+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -+ -+[[package]] -+name = "minimal-lexical" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - - [[package]] - name = "mio" -@@ -751,15 +835,12 @@ dependencies = [ - - [[package]] - name = "nom" --version = "6.1.2" -+version = "7.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" - dependencies = [ -- "bitvec", -- "funty", -- "lexical-core", - "memchr", -- "version_check", -+ "minimal-lexical", - ] - - [[package]] -@@ -773,33 +854,21 @@ dependencies = [ - - [[package]] - name = "num-bigint" --version = "0.3.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" --dependencies = [ -- "autocfg 1.0.1", -- "num-integer", -- "num-traits", --] -- --[[package]] --name = "num-bigint" --version = "0.4.2" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" -+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg", - "num-integer", - "num-traits", - ] - - [[package]] - name = "num-bigint-dig" --version = "0.7.0" -+version = "0.8.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" -+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" - dependencies = [ -- "autocfg 0.1.7", - "byteorder", - "lazy_static", - "libm", -@@ -817,7 +886,7 @@ version = "0.1.44" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg", - "num-traits", - ] - -@@ -827,7 +896,7 @@ version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg", - "num-integer", - "num-traits", - ] -@@ -838,7 +907,7 @@ version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg", - "libm", - ] - -@@ -854,15 +923,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.8.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -- --[[package]] --name = "opaque-debug" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - - [[package]] - name = "parking_lot" -@@ -884,20 +947,24 @@ dependencies = [ - "cfg-if", - "instant", - "libc", -- "redox_syscall", -+ "redox_syscall 0.2.9", - "smallvec", - "winapi", - ] - - [[package]] --name = "pem" --version = "0.8.3" -+name = "paste" -+version = "1.0.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" -+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -+ -+[[package]] -+name = "pem-rfc7468" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" - dependencies = [ -- "base64", -- "once_cell", -- "regex", -+ "base64ct", - ] - - [[package]] -@@ -906,11 +973,31 @@ version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -+[[package]] -+name = "pin-project" -+version = "1.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.65", -+] -+ - [[package]] - name = "pin-project-lite" --version = "0.2.6" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" -+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - - [[package]] - name = "pin-utils" -@@ -918,6 +1005,28 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkcs1" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" -+dependencies = [ -+ "der", -+ "pkcs8", -+ "zeroize", -+] -+ -+[[package]] -+name = "pkcs8" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -+dependencies = [ -+ "der", -+ "spki", -+ "zeroize", -+] -+ - [[package]] - name = "pkg-config" - version = "0.3.19" -@@ -930,6 +1039,15 @@ version = "0.2.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -+[[package]] -+name = "proc-macro-crate" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -+dependencies = [ -+ "toml 0.5.11", -+] -+ - [[package]] - name = "proc-macro-error" - version = "1.0.4" -@@ -939,7 +1057,7 @@ dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "version_check", - ] - -@@ -955,41 +1073,43 @@ dependencies = [ - ] - - [[package]] --name = "proc-macro-hack" --version = "0.5.19" -+name = "proc-macro2" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" -+dependencies = [ -+ "unicode-ident", -+] - - [[package]] --name = "proc-macro-nested" --version = "0.1.7" -+name = "ptr_meta" -+version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -+dependencies = [ -+ "ptr_meta_derive", -+] - - [[package]] --name = "proc-macro2" --version = "1.0.27" -+name = "ptr_meta_derive" -+version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" -+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" - dependencies = [ -- "unicode-xid", -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", - ] - - [[package]] - name = "quote" --version = "1.0.9" -+version = "1.0.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" - dependencies = [ - "proc-macro2", - ] - --[[package]] --name = "radium" --version = "0.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -- - [[package]] - name = "rand" - version = "0.8.4" -@@ -1039,6 +1159,15 @@ dependencies = [ - "bitflags", - ] - -+[[package]] -+name = "redox_syscall" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -+dependencies = [ -+ "bitflags", -+] -+ - [[package]] - name = "redox_users" - version = "0.4.0" -@@ -1046,26 +1175,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" - dependencies = [ - "getrandom", -- "redox_syscall", -+ "redox_syscall 0.2.9", - ] - - [[package]] --name = "regex" --version = "1.5.4" -+name = "rend" -+version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" - dependencies = [ -- "aho-corasick", -- "memchr", -- "regex-syntax", -+ "bytecheck", - ] - --[[package]] --name = "regex-syntax" --version = "0.6.25" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" -- - [[package]] - name = "ring" - version = "0.16.20" -@@ -1075,41 +1196,73 @@ dependencies = [ - "cc", - "libc", - "once_cell", -- "spin", -+ "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", - ] - -+[[package]] -+name = "rkyv" -+version = "0.7.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3" -+dependencies = [ -+ "bytecheck", -+ "hashbrown 0.12.3", -+ "ptr_meta", -+ "rend", -+ "rkyv_derive", -+ "seahash", -+] -+ -+[[package]] -+name = "rkyv_derive" -+version = "0.7.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 1.0.109", -+] -+ - [[package]] - name = "rsa" --version = "0.4.1" -+version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" -+checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" - dependencies = [ - "byteorder", - "digest", -- "lazy_static", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", -- "pem", -- "rand", -- "simple_asn1", -+ "pkcs1", -+ "pkcs8", -+ "rand_core", -+ "smallvec", - "subtle", - "zeroize", - ] - - [[package]] - name = "rust_decimal" --version = "1.15.0" -+version = "1.30.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5446d1cf2dfe2d6367c8b27f2082bdf011e60e76fa1fcd140047f535156d6e7" -+checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" - dependencies = [ - "arrayvec", -+ "borsh", -+ "bytecheck", -+ "byteorder", -+ "bytes", - "num-traits", -+ "rand", -+ "rkyv", - "serde", -+ "serde_json", - ] - - [[package]] -@@ -1147,33 +1300,38 @@ dependencies = [ - "untrusted", - ] - -+[[package]] -+name = "seahash" -+version = "4.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -+ - [[package]] - name = "serde" --version = "1.0.126" -+version = "1.0.202" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" -+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.126" -+version = "1.0.202" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" -+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.65", - ] - - [[package]] - name = "serde_json" --version = "1.0.64" -+version = "1.0.117" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" - dependencies = [ -- "indexmap", - "itoa", - "ryu", - "serde", -@@ -1181,28 +1339,24 @@ dependencies = [ - - [[package]] - name = "sha-1" --version = "0.9.6" -+version = "0.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" -+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" - dependencies = [ -- "block-buffer", - "cfg-if", - "cpufeatures", - "digest", -- "opaque-debug", - ] - - [[package]] - name = "sha2" --version = "0.9.5" -+version = "0.10.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" -+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" - dependencies = [ -- "block-buffer", - "cfg-if", - "cpufeatures", - "digest", -- "opaque-debug", - ] - - [[package]] -@@ -1247,16 +1401,10 @@ dependencies = [ - ] - - [[package]] --name = "simple_asn1" --version = "0.5.4" -+name = "simdutf8" -+version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" --dependencies = [ -- "chrono", -- "num-bigint 0.4.2", -- "num-traits", -- "thiserror", --] -+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - - [[package]] - name = "slab" -@@ -1266,9 +1414,9 @@ checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" - - [[package]] - name = "smallvec" --version = "1.6.1" -+version = "1.13.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - - [[package]] - name = "spin" -@@ -1276,24 +1424,41 @@ version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -+[[package]] -+name = "spin" -+version = "0.9.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -+dependencies = [ -+ "lock_api", -+] -+ -+[[package]] -+name = "spki" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -+dependencies = [ -+ "base64ct", -+ "der", -+] -+ - [[package]] - name = "sqlformat" --version = "0.1.6" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c" -+checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" - dependencies = [ -- "lazy_static", -- "maplit", -+ "itertools", - "nom", -- "regex", - "unicode_categories", - ] - - [[package]] - name = "sqlx" --version = "0.5.7" -+version = "0.5.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e4b94ab0f8c21ee4899b93b06451ef5d965f1a355982ee73684338228498440" -+checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" - dependencies = [ - "sqlx-core", - "sqlx-macros", -@@ -1301,9 +1466,9 @@ dependencies = [ - - [[package]] - name = "sqlx-core" --version = "0.5.7" -+version = "0.5.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026" -+checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" - dependencies = [ - "ahash", - "atoi", -@@ -1312,29 +1477,32 @@ dependencies = [ - "byteorder", - "bytes", - "chrono", -- "crossbeam-channel", - "crossbeam-queue", -- "crossbeam-utils", - "digest", - "dirs", - "either", -+ "event-listener", -+ "flume", - "futures-channel", - "futures-core", -+ "futures-executor", - "futures-intrusive", - "futures-util", - "generic-array", - "hashlink", - "hex", -+ "hkdf", - "hmac", -+ "indexmap", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "md-5", - "memchr", -- "num-bigint 0.3.2", -+ "num-bigint", - "once_cell", -- "parking_lot", -+ "paste", - "percent-encoding", - "rand", - "rsa", -@@ -1358,41 +1526,34 @@ dependencies = [ - - [[package]] - name = "sqlx-macros" --version = "0.5.7" -+version = "0.5.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4dc33c35d54774eed73d54568d47a6ac099aed8af5e1556a017c131be88217d5" -+checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" - dependencies = [ - "dotenv", - "either", -- "futures", -- "heck", -+ "heck 0.4.1", - "once_cell", - "proc-macro2", - "quote", - "serde_json", - "sqlx-core", - "sqlx-rt", -- "syn", -+ "syn 1.0.109", - "url", - ] - - [[package]] - name = "sqlx-rt" --version = "0.5.7" -+version = "0.5.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14302b678d9c76b28f2e60115211e25e0aabc938269991745a169753dc00e35c" -+checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" - dependencies = [ - "once_cell", - "tokio", - "tokio-rustls", - ] - --[[package]] --name = "static_assertions" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -- - [[package]] - name = "stringprep" - version = "0.1.2" -@@ -1426,11 +1587,11 @@ version = "0.4.15" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" - dependencies = [ -- "heck", -+ "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1445,10 +1606,10 @@ version = "0.21.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" - dependencies = [ -- "heck", -+ "heck 0.3.3", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1459,33 +1620,26 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" - - [[package]] - name = "syn" --version = "1.0.73" -+version = "1.0.109" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" -+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" - dependencies = [ - "proc-macro2", - "quote", -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] --name = "synstructure" --version = "0.12.4" -+name = "syn" -+version = "2.0.65" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -+checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -- "unicode-xid", -+ "unicode-ident", - ] - --[[package]] --name = "tap" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -- - [[package]] - name = "textwrap" - version = "0.11.0" -@@ -1497,22 +1651,22 @@ dependencies = [ - - [[package]] - name = "thiserror" --version = "1.0.25" -+version = "1.0.61" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" -+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.25" -+version = "1.0.61" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" -+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.65", - ] - - [[package]] -@@ -1542,11 +1696,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - - [[package]] - name = "tokio" --version = "1.11.0" -+version = "1.16.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" -+checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" - dependencies = [ -- "autocfg 1.0.1", - "bytes", - "libc", - "memchr", -@@ -1562,13 +1715,13 @@ dependencies = [ - - [[package]] - name = "tokio-macros" --version = "1.3.0" -+version = "1.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" -+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1584,9 +1737,9 @@ dependencies = [ - - [[package]] - name = "tokio-stream" --version = "0.1.7" -+version = "0.1.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" -+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" - dependencies = [ - "futures-core", - "pin-project-lite", -@@ -1602,6 +1755,15 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "toml" -+version = "0.5.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -+dependencies = [ -+ "serde", -+] -+ - [[package]] - name = "tui" - version = "0.15.0" -@@ -1617,9 +1779,9 @@ dependencies = [ - - [[package]] - name = "typenum" --version = "1.13.0" -+version = "1.17.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" -+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - - [[package]] - name = "unicode-bidi" -@@ -1630,6 +1792,12 @@ dependencies = [ - "matches", - ] - -+[[package]] -+name = "unicode-ident" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+ - [[package]] - name = "unicode-normalization" - version = "0.1.19" -@@ -1651,12 +1819,6 @@ version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - --[[package]] --name = "unicode-xid" --version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -- - [[package]] - name = "unicode_categories" - version = "0.1.1" -@@ -1705,6 +1867,12 @@ version = "0.10.2+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -+[[package]] -+name = "wasite" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" -+ - [[package]] - name = "wasm-bindgen" - version = "0.2.74" -@@ -1726,7 +1894,7 @@ dependencies = [ - "log", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-shared", - ] - -@@ -1748,7 +1916,7 @@ checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -@@ -1801,11 +1969,12 @@ dependencies = [ - - [[package]] - name = "whoami" --version = "1.1.2" -+version = "1.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" -+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" - dependencies = [ -- "wasm-bindgen", -+ "redox_syscall 0.4.1", -+ "wasite", - "web-sys", - ] - -@@ -1831,29 +2000,8 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - --[[package]] --name = "wyz" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" -- - [[package]] - name = "zeroize" --version = "1.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" --dependencies = [ -- "zeroize_derive", --] -- --[[package]] --name = "zeroize_derive" --version = "1.1.0" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn", -- "synstructure", --] -+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -diff --git a/Cargo.toml b/Cargo.toml -index 95f5b91..ea7eec5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -20,7 +20,7 @@ tui = { version = "0.15.0", features = ["crossterm"], default-features = false } - crossterm = "0.20" - anyhow = "1.0.38" - unicode-width = "0.1" --sqlx = { version = "0.5.6", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } -+sqlx = { version = "0.5.13", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } - chrono = "0.4" - tokio = { version = "1.11.0", features = ["full"] } - futures = "0.3.5" diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index faf03afd13aa..83bb11fe445e 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "26.1.7"; + version = "26.1.8"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-RI5+uAg3iGMmWREWYn+ChnEB9WyPa2tImB35Vuhoe7Q="; + sha256 = "sha256-/puIAMeUASG50U35RTRVIOlfD4NY3HZUZ6BKJzEh/s4="; }; in buildGoModule rec { diff --git a/pkgs/by-name/wi/wiiuse/package.nix b/pkgs/by-name/wi/wiiuse/package.nix index 5556baf4d765..2d1e5b00a4c7 100644 --- a/pkgs/by-name/wi/wiiuse/package.nix +++ b/pkgs/by-name/wi/wiiuse/package.nix @@ -46,6 +46,15 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) ]; + # On Darwin (and Windows), upstream's CMakeLists.txt forcibly overrides + # CMAKE_INSTALL_LIBDIR to "lib", ignoring the value passed by the cmake + # setup hook, so the libraries end up in $out/lib instead of $lib/lib. + # Move them into the lib output manually. + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $lib/lib + mv $out/lib/libwiiuse* $lib/lib/ + ''; + meta = { description = "Feature complete cross-platform Wii Remote access library"; mainProgram = "wiiuseexample"; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 80c384ef7188..17abacfe3398 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "nsjail"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - hash = "sha256-/K+qJV5Dq+my45Cpw6czdsWLtO9lnJwZTsOIRt4Iijk="; + hash = "sha256-4fFXPwfPErve5CkVBtjPd1In8eEDby/RhuyW952YW7Y="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4c0efe0ca10..11f966894fd7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -893,6 +893,7 @@ mapAliases { go-thumbnailer = throw "'go-thumbnailer' has been renamed to/replaced by 'thud'"; # Converted to throw 2025-10-27 go-upower-notify = throw "'go-upower-notify' has been renamed to/replaced by 'upower-notify'"; # Converted to throw 2025-10-27 go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13 + gobang = throw "'gobang' has been removed as it is unmaintained upstream. Consider using `lazysql` or `rainfrog` instead."; # added godot-export-templates = throw "'godot-export-templates' has been renamed to/replaced by 'godot-export-templates-bin'"; # Converted to throw 2025-10-27 godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27 godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27