From 99791e0252efdde07079c1a22dc92889a11a2530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Fri, 8 Aug 2025 20:25:31 +0200 Subject: [PATCH 01/22] tantivy-go: 1.0.1 -> 1.0.4 --- .../ta/tantivy-go/add-Cargo.lock.patch | 489 +++++++++++------- pkgs/by-name/ta/tantivy-go/package.nix | 6 +- 2 files changed, 319 insertions(+), 176 deletions(-) diff --git a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch index 50fa59c32807..395a38741d53 100644 --- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch +++ b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch @@ -1,9 +1,9 @@ diff --git a/rust/Cargo.lock b/rust/Cargo.lock new file mode 100644 -index 0000000..7cb3275 +index 0000000..6717372 --- /dev/null +++ b/rust/Cargo.lock -@@ -0,0 +1,1762 @@ +@@ -0,0 +1,1908 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 @@ -16,14 +16,14 @@ index 0000000..7cb3275 + +[[package]] +name = "ahash" -+version = "0.8.11" ++version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" ++checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", -+ "zerocopy 0.7.35", ++ "zerocopy", +] + +[[package]] @@ -43,9 +43,9 @@ index 0000000..7cb3275 + +[[package]] +name = "anstream" -+version = "0.6.18" ++version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" ++checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +dependencies = [ + "anstyle", + "anstyle-parse", @@ -58,37 +58,37 @@ index 0000000..7cb3275 + +[[package]] +name = "anstyle" -+version = "1.0.10" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" ++checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" -+version = "0.2.6" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" ++checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" -+version = "1.1.2" ++version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" ++checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +dependencies = [ -+ "windows-sys 0.59.0", ++ "windows-sys 0.60.2", +] + +[[package]] +name = "anstyle-wincon" -+version = "3.0.7" ++version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" ++checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +dependencies = [ + "anstyle", -+ "once_cell", -+ "windows-sys 0.59.0", ++ "once_cell_polyfill", ++ "windows-sys 0.60.2", +] + +[[package]] @@ -105,14 +105,14 @@ index 0000000..7cb3275 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] +name = "autocfg" -+version = "1.4.0" ++version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" ++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base64" @@ -122,9 +122,9 @@ index 0000000..7cb3275 + +[[package]] +name = "bitflags" -+version = "2.9.0" ++version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" ++checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bitpacking" @@ -137,9 +137,9 @@ index 0000000..7cb3275 + +[[package]] +name = "bon" -+version = "3.6.1" ++version = "3.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94054366e2ff97b455acdd4fdb03913f717febc57b7bbd1741b2c3b87efae030" ++checksum = "33d9ef19ae5263a138da9a86871eca537478ab0332a7770bac7e3f08b801f89f" +dependencies = [ + "bon-macros", + "rustversion", @@ -147,9 +147,9 @@ index 0000000..7cb3275 + +[[package]] +name = "bon-macros" -+version = "3.6.1" ++version = "3.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "542a990e676ce0a0a895ae54b2d94afd012434f2228a85b186c6bc1a7056cdc6" ++checksum = "577ae008f2ca11ca7641bd44601002ee5ab49ef0af64846ce1ab6057218a5cc1" +dependencies = [ + "darling", + "ident_case", @@ -157,10 +157,16 @@ index 0000000..7cb3275 + "proc-macro2", + "quote", + "rustversion", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] ++name = "bumpalo" ++version = "3.19.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" ++ ++[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -180,16 +186,16 @@ index 0000000..7cb3275 + "quote", + "serde", + "serde_json", -+ "syn 2.0.100", ++ "syn 2.0.104", + "tempfile", + "toml", +] + +[[package]] +name = "cc" -+version = "1.2.19" ++version = "1.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" ++checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e" +dependencies = [ + "jobserver", + "libc", @@ -213,24 +219,24 @@ index 0000000..7cb3275 + +[[package]] +name = "cfg-if" -+version = "1.0.0" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + +[[package]] +name = "clap" -+version = "4.5.36" ++version = "4.5.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" ++checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" -+version = "4.5.36" ++version = "4.5.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" ++checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65" +dependencies = [ + "anstream", + "anstyle", @@ -240,15 +246,15 @@ index 0000000..7cb3275 + +[[package]] +name = "clap_lex" -+version = "0.7.4" ++version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" ++checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" + +[[package]] +name = "colorchoice" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" ++checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "core2" @@ -261,9 +267,9 @@ index 0000000..7cb3275 + +[[package]] +name = "crc32fast" -+version = "1.4.2" ++version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" ++checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] @@ -310,9 +316,9 @@ index 0000000..7cb3275 + +[[package]] +name = "darling" -+version = "0.20.11" ++version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" ++checksum = "d6b136475da5ef7b6ac596c0e956e37bad51b85b987ff3d5e230e964936736b2" +dependencies = [ + "darling_core", + "darling_macro", @@ -320,27 +326,27 @@ index 0000000..7cb3275 + +[[package]] +name = "darling_core" -+version = "0.20.11" ++version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" ++checksum = "b44ad32f92b75fb438b04b68547e521a548be8acc339a6dacc4a7121488f53e6" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] +name = "darling_macro" -+version = "0.20.11" ++version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" ++checksum = "2b5be8a7a562d315a5b92a630c30cec6bcf663e6673f00fbb69cca66a6f521b9" +dependencies = [ + "darling_core", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -402,12 +408,12 @@ index 0000000..7cb3275 + +[[package]] +name = "errno" -+version = "0.3.11" ++version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" ++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +dependencies = [ + "libc", -+ "windows-sys 0.59.0", ++ "windows-sys 0.60.2", +] + +[[package]] @@ -458,7 +464,7 @@ index 0000000..7cb3275 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -492,20 +498,20 @@ index 0000000..7cb3275 + +[[package]] +name = "getrandom" -+version = "0.2.15" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" ++checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", -+ "wasi 0.11.0+wasi-snapshot-preview1", ++ "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" -+version = "0.3.2" ++version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" ++checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", @@ -525,9 +531,9 @@ index 0000000..7cb3275 + +[[package]] +name = "hashbrown" -+version = "0.15.2" ++version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" ++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", @@ -581,17 +587,17 @@ index 0000000..7cb3275 + "libflate", + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] +name = "indexmap" -+version = "2.9.0" ++version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" ++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +dependencies = [ + "equivalent", -+ "hashbrown 0.15.2", ++ "hashbrown 0.15.5", +] + +[[package]] @@ -626,9 +632,9 @@ index 0000000..7cb3275 + +[[package]] +name = "jieba-rs" -+version = "0.7.2" ++version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d1bcad6332969e4d48ee568d430e14ee6dea70740c2549d005d87677ebefb0c" ++checksum = "f5dd552bbb95d578520ee68403bf8aaf0dbbb2ce55b0854d019f9350ad61040a" +dependencies = [ + "cedarwood", + "fxhash", @@ -641,9 +647,9 @@ index 0000000..7cb3275 + +[[package]] +name = "jiff" -+version = "0.2.8" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" ++checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", @@ -654,13 +660,13 @@ index 0000000..7cb3275 + +[[package]] +name = "jiff-static" -+version = "0.2.8" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" ++checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -669,11 +675,21 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +dependencies = [ -+ "getrandom 0.3.2", ++ "getrandom 0.3.3", + "libc", +] + +[[package]] ++name = "js-sys" ++version = "0.3.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" ++dependencies = [ ++ "once_cell", ++ "wasm-bindgen", ++] ++ ++[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -687,9 +703,9 @@ index 0000000..7cb3275 + +[[package]] +name = "libc" -+version = "0.2.172" ++version = "0.2.174" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" ++checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" + +[[package]] +name = "libflate" @@ -717,9 +733,9 @@ index 0000000..7cb3275 + +[[package]] +name = "libm" -+version = "0.2.11" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" ++checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "linux-raw-sys" @@ -748,7 +764,7 @@ index 0000000..7cb3275 + "proc-macro-error", + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -757,14 +773,14 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ -+ "hashbrown 0.15.2", ++ "hashbrown 0.15.5", +] + +[[package]] +name = "lz4_flex" -+version = "0.11.3" ++version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" ++checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" + +[[package]] +name = "measure_time" @@ -777,15 +793,15 @@ index 0000000..7cb3275 + +[[package]] +name = "memchr" -+version = "2.7.4" ++version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "memmap2" -+version = "0.9.5" ++version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" ++checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28" +dependencies = [ + "libc", +] @@ -835,6 +851,12 @@ index 0000000..7cb3275 +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] ++name = "once_cell_polyfill" ++version = "1.70.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" ++ ++[[package]] +name = "oneshot" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -888,7 +910,7 @@ index 0000000..7cb3275 + "phf_shared", + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -920,9 +942,9 @@ index 0000000..7cb3275 + +[[package]] +name = "portable-atomic" -+version = "1.11.0" ++version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" ++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" @@ -945,17 +967,17 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ -+ "zerocopy 0.8.24", ++ "zerocopy", +] + +[[package]] +name = "prettyplease" -+version = "0.2.32" ++version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" ++checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" +dependencies = [ + "proc-macro2", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -1002,9 +1024,9 @@ index 0000000..7cb3275 + +[[package]] +name = "r-efi" -+version = "5.2.0" ++version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" @@ -1033,7 +1055,7 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ -+ "getrandom 0.2.15", ++ "getrandom 0.2.16", +] + +[[package]] @@ -1127,22 +1149,22 @@ index 0000000..7cb3275 + +[[package]] +name = "rustix" -+version = "1.0.5" ++version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" ++checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", -+ "windows-sys 0.59.0", ++ "windows-sys 0.60.2", +] + +[[package]] +name = "rustversion" -+version = "1.0.20" ++version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "ryu" @@ -1167,14 +1189,14 @@ index 0000000..7cb3275 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] +name = "serde_json" -+version = "1.0.140" ++version = "1.0.142" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" ++checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +dependencies = [ + "itoa", + "memchr", @@ -1184,9 +1206,9 @@ index 0000000..7cb3275 + +[[package]] +name = "serde_spanned" -+version = "0.6.8" ++version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" ++checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] @@ -1214,18 +1236,15 @@ index 0000000..7cb3275 + +[[package]] +name = "slab" -+version = "0.4.9" ++version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -+dependencies = [ -+ "autocfg", -+] ++checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" -+version = "1.15.0" ++version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" ++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "stable_deref_trait" @@ -1251,9 +1270,9 @@ index 0000000..7cb3275 + +[[package]] +name = "syn" -+version = "2.0.100" ++version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" ++checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", @@ -1426,14 +1445,14 @@ index 0000000..7cb3275 + +[[package]] +name = "tempfile" -+version = "3.19.1" ++version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" ++checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +dependencies = [ + "fastrand", -+ "getrandom 0.3.2", ++ "getrandom 0.3.3", + "once_cell", -+ "rustix 1.0.5", ++ "rustix 1.0.8", + "windows-sys 0.59.0", +] + @@ -1454,7 +1473,7 @@ index 0000000..7cb3275 +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -1490,9 +1509,9 @@ index 0000000..7cb3275 + +[[package]] +name = "toml" -+version = "0.8.20" ++version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" ++checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", @@ -1502,27 +1521,34 @@ index 0000000..7cb3275 + +[[package]] +name = "toml_datetime" -+version = "0.6.8" ++version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" ++checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" -+version = "0.22.24" ++version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" ++checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", ++ "toml_write", + "winnow", +] + +[[package]] ++name = "toml_write" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" ++ ++[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1548,12 +1574,14 @@ index 0000000..7cb3275 + +[[package]] +name = "uuid" -+version = "1.16.0" ++version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" ++checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +dependencies = [ -+ "getrandom 0.3.2", ++ "getrandom 0.3.3", ++ "js-sys", + "serde", ++ "wasm-bindgen", +] + +[[package]] @@ -1564,9 +1592,9 @@ index 0000000..7cb3275 + +[[package]] +name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" ++version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" @@ -1578,6 +1606,64 @@ index 0000000..7cb3275 +] + +[[package]] ++name = "wasm-bindgen" ++version = "0.2.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++ "rustversion", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.104", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.104", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1600,12 +1686,18 @@ index 0000000..7cb3275 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] ++name = "windows-link" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" ++ ++[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ -+ "windows-targets", ++ "windows-targets 0.52.6", +] + +[[package]] @@ -1614,7 +1706,16 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ -+ "windows-targets", ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.60.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" ++dependencies = [ ++ "windows-targets 0.53.3", +] + +[[package]] @@ -1623,14 +1724,31 @@ index 0000000..7cb3275 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ -+ "windows_aarch64_gnullvm", -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_gnullvm", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_gnullvm", -+ "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm 0.52.6", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.53.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" ++dependencies = [ ++ "windows-link", ++ "windows_aarch64_gnullvm 0.53.0", ++ "windows_aarch64_msvc 0.53.0", ++ "windows_i686_gnu 0.53.0", ++ "windows_i686_gnullvm 0.53.0", ++ "windows_i686_msvc 0.53.0", ++ "windows_x86_64_gnu 0.53.0", ++ "windows_x86_64_gnullvm 0.53.0", ++ "windows_x86_64_msvc 0.53.0", +] + +[[package]] @@ -1640,52 +1758,100 @@ index 0000000..7cb3275 +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" ++ ++[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] ++name = "windows_aarch64_msvc" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" ++ ++[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] ++name = "windows_i686_gnu" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" ++ ++[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] ++name = "windows_i686_gnullvm" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" ++ ++[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] ++name = "windows_i686_msvc" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" ++ ++[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] ++name = "windows_x86_64_gnu" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" ++ ++[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.53.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" ++ ++[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] -+name = "winnow" -+version = "0.7.6" ++name = "windows_x86_64_msvc" ++version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" ++checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" ++ ++[[package]] ++name = "winnow" ++version = "0.7.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +dependencies = [ + "memchr", +] @@ -1701,42 +1867,22 @@ index 0000000..7cb3275 + +[[package]] +name = "zerocopy" -+version = "0.7.35" ++version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ -+ "zerocopy-derive 0.7.35", -+] -+ -+[[package]] -+name = "zerocopy" -+version = "0.8.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" -+dependencies = [ -+ "zerocopy-derive 0.8.24", ++ "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" -+version = "0.7.35" ++version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.100", -+] -+ -+[[package]] -+name = "zerocopy-derive" -+version = "0.8.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", ++ "syn 2.0.104", +] + +[[package]] @@ -1766,6 +1912,3 @@ index 0000000..7cb3275 + "cc", + "pkg-config", +] --- -2.48.1 - diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix index 44c9037f7ab6..b4c98758213d 100644 --- a/pkgs/by-name/ta/tantivy-go/package.nix +++ b/pkgs/by-name/ta/tantivy-go/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tantivy-go"; - version = "1.0.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "anyproto"; repo = "tantivy-go"; tag = "v${version}"; - hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU="; + hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM="; }; - cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY="; + cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260="; cargoPatches = [ ./add-Cargo.lock.patch From 84d4d28d4fc334ed0e5ff35cce0eba69883ee4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 27 May 2025 20:23:16 +0200 Subject: [PATCH 02/22] anytype-heart: 0.40.21 -> 0.43.0-rc02 --- pkgs/by-name/an/anytype-heart/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index e3f4bde83b1c..0c04e43d1f03 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -13,12 +13,12 @@ let pname = "anytype-heart"; # Use only versions specified in anytype-ts middleware.version file: # https://github.com/anyproto/anytype-ts/blob/v/middleware.version - version = "0.40.21"; + version = "0.43.0-rc02"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-heart"; tag = "v${version}"; - hash = "sha256-53LSaETzxwhKkI9is6N6G1+f5Cnf7KStvHA9qeaWUNo="; + hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k="; }; arch = @@ -36,7 +36,7 @@ in buildGoModule { inherit pname version src; - vendorHash = "sha256-WsYRkAIYDkKWkQpq843dD7Rqc993eHSgee2IX6PomcU="; + vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI="; subPackages = [ "cmd/grpcserver" ]; tags = [ From 327eae33cd776a8bb7f1ab07682edb52a7aa4c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 27 May 2025 20:23:56 +0200 Subject: [PATCH 03/22] anytype: 0.46.5 -> 0.49.2 0001-fix-single-instance-detection-when-not-packaged.patch is now included upstream --- ...instance-detection-when-not-packaged.patch | 25 ------------------- .../anytype/0002-remove-grpc-devtools.patch | 12 +++++++++ pkgs/by-name/an/anytype/package.nix | 12 ++++----- 3 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch create mode 100644 pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch diff --git a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch b/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch deleted file mode 100644 index 6e09070d72eb..000000000000 --- a/pkgs/by-name/an/anytype/0001-fix-single-instance-detection-when-not-packaged.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0622b4b5497d8bd923eb0d6dd3f917dfcbda9d53 Mon Sep 17 00:00:00 2001 -From: Axel Karjalainen -Date: Thu, 22 May 2025 22:38:14 +0300 -Subject: [PATCH] fix: single instance detection when not packaged - ---- - electron.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/electron.js b/electron.js -index d70f20f..158bb93 100644 ---- a/electron.js -+++ b/electron.js -@@ -76,7 +76,7 @@ if (is.development && !port) { - return; - }; - --if (app.isPackaged && !app.requestSingleInstanceLock()) { -+if (!is.development && !app.requestSingleInstanceLock()) { - Api.exit(mainWindow, '' ,false); - return; - }; --- -2.49.0 - diff --git a/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch new file mode 100644 index 000000000000..b0dad3b73d7b --- /dev/null +++ b/pkgs/by-name/an/anytype/0002-remove-grpc-devtools.patch @@ -0,0 +1,12 @@ +diff --git a/electron.js b/electron.js +index c5d6760882..17afc05e26 100644 +--- a/electron.js ++++ b/electron.js +@@ -15,7 +15,6 @@ const store = new Store({ name: [ 'localStorage', suffix ].join('-') }); + + // gRPC DevTools extension ID + const GRPC_DEVTOOLS_ID = 'fohdnlaeecihjiendkfhifhlgldpeopm'; +-const { installExtension } = require('@tomjs/electron-devtools-installer'); + + // Fix notifications app name + if (is.windows) { diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 268e3734b812..bc26c9edb49c 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -13,27 +13,27 @@ let pname = "anytype"; - version = "0.46.5"; + version = "0.49.2"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-ts"; tag = "v${version}"; - hash = "sha256-gDlxyHxBLWVBLnaI6rFclfjwqkw9gneBEC7ssmWDKYU="; + hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU="; }; description = "P2P note-taking tool"; locales = fetchFromGitHub { owner = "anyproto"; repo = "l10n-anytype-ts"; - rev = "1d7ca0073bdd02d0145b8da3b1b956ca0652a108"; - hash = "sha256-aL79DOIFH3CocbcLW0SJ472mYPZJXrPJyRKy8zXiF4o="; + rev = "873b42df7320ebbbc80d7e2477914dac70363ef7"; + hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg="; }; in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-WEw3RCi7dWs2eMYxLH7DcmWBrN4T8T6beIyplcXgJAA="; + npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -52,7 +52,7 @@ buildNpmPackage { patches = [ ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch - ./0001-fix-single-instance-detection-when-not-packaged.patch + ./0002-remove-grpc-devtools.patch ]; buildPhase = '' From 047ebc793a5a5436fe508066ed6807142c801e09 Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Mon, 1 Sep 2025 09:17:15 -0700 Subject: [PATCH 04/22] acct: repair buffer overflow with dump-acct The failure is encountered when doing like ``` $ sudo mkdir -p /var/log/account; $ sudo touch /var/log/account/pacct; $ nix build 'github:nixos/nixpkgs#acct' -o ./result-acct; $ sudo ./result-acct/bin/accton on; # writing to /var/log/account/pacct $ sudo ./result-acct/bin/dump-acct /var/log/account/pacct *** buffer overflow detected ***: terminated [1] 37428 abort sudo dump-acct /var/log/account/pacct ``` and is apparently rooted in FORTIFY_SOURCE_3. I found out that Gentoo users had already hit and reported this [1] but they found that Fedora users had already hit, reported, and fixed this [2]. So, I'm bringing in Fedora's patch. [1] - https://bugs.gentoo.org/925419#c14 [2] - https://bugzilla.redhat.com/show_bug.cgi?id=2190057 --- pkgs/by-name/ac/acct/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ac/acct/package.nix b/pkgs/by-name/ac/acct/package.nix index ec7b5c10f6ce..8fb0cb755837 100644 --- a/pkgs/by-name/ac/acct/package.nix +++ b/pkgs/by-name/ac/acct/package.nix @@ -2,6 +2,7 @@ fetchurl, lib, stdenv, + fetchpatch2, }: stdenv.mkDerivation rec { @@ -15,6 +16,13 @@ stdenv.mkDerivation rec { doCheck = true; + patches = [ + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/psacct/raw/rawhide/f/psacct-6.6.4-sprintf-buffer-overflow.patch"; + hash = "sha256-l74tLIuhpXj+dIA7uAY9L0qMjQ2SbDdc+vjHMyVouFc="; + }) + ]; + meta = { description = "GNU Accounting Utilities, login and process accounting utilities"; From 99f2fe6f6ee0c8c739cb4ddaedf0ca335c202aac Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 23 Aug 2025 17:11:55 -0700 Subject: [PATCH 05/22] dwarf-fortress: update.rb: display multiple updates correctly --- pkgs/games/dwarf-fortress/update.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/update.rb b/pkgs/games/dwarf-fortress/update.rb index ff051cad15cb..d00fd1d1a750 100755 --- a/pkgs/games/dwarf-fortress/update.rb +++ b/pkgs/games/dwarf-fortress/update.rb @@ -571,7 +571,7 @@ class DFLock < Struct.new(:game, :therapist, keyword_init: true) # Returns an array containing all versions. def all_versions - self.game.versions.keys.map {"DF #{_1}"}.to_a + ["DT #{self.therapist.version}"] + [self.game.versions.keys.lazy.map {"DF #{_1}"}.first] + ["DT #{self.therapist.version}"] end # Loads this DFLock. From 394fe94fa1a2a3132c00eea3749cfd9a241eb9ad Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 4 Sep 2025 07:08:41 +0000 Subject: [PATCH 06/22] dwarf-fortress-packages: DF 51.11 -> DF 52.04; DT 42.1.13 -> DT 42.1.18 Performed the following automatic DF updates: - DF 51.11 -> DF 52.04 - DT 42.1.13 -> DT 42.1.18 --- pkgs/games/dwarf-fortress/df.lock.json | 46 ++++++++++++++++++-------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json index 5ffff70c7e9a..4e4c5f3e8bc8 100644 --- a/pkgs/games/dwarf-fortress/df.lock.json +++ b/pkgs/games/dwarf-fortress/df.lock.json @@ -1,28 +1,48 @@ { "game": { "latest": { - "linux": "51.11", + "linux": "52.04", "darwin": "0.47.05" }, "versions": { - "51.11": { + "52.04": { "df": { - "version": "51.11", + "version": "52.04", "urls": { "linux": { - "url": "https://www.bay12games.com/dwarves/df_51_11_linux.tar.bz2", - "outputHash": "sha256-51cwIFMm5cwSaXjjhpz4pS3D8B5/Mt5+k1ALu1F+JWc=" + "url": "https://www.bay12games.com/dwarves/df_52_04_linux.tar.bz2", + "outputHash": "sha256-x/v4yWuojnbea0N7KUAINBdhPBjl0DoWy8Pi/eDCpec=" } } }, "hack": { - "version": "51.11-r1.2", + "version": "52.04-r1", "git": { "url": "https://github.com/DFHack/dfhack.git", - "revision": "51.11-r1.2", - "outputHash": "sha256-x8zY8IGDhnyoeNz24Mt00o+2XLzSHZG165MXQHXW+YA=" + "revision": "52.04-r1", + "outputHash": "sha256-DPW+fvurUYnwfGrEqV3JEN1TfllOJPHqGIlNJ3Wha90=" }, - "xmlRev": "6502bdefd1796315365a7bb58e30e0ce34359bea" + "xmlRev": "7b691d256f9427036e7ff24fa795a0f9334739e7" + } + }, + "51.13": { + "df": { + "version": "51.13", + "urls": { + "linux": { + "url": "https://www.bay12games.com/dwarves/df_51_13_linux.tar.bz2", + "outputHash": "sha256-Fdb3QS+P0xL4/U0z6nZyMh78KVHDiu9TI3fF6saAw3I=" + } + } + }, + "hack": { + "version": "51.13-r1", + "git": { + "url": "https://github.com/DFHack/dfhack.git", + "revision": "51.13-r1", + "outputHash": "sha256-Z6ZmXl4BmSg9jRwPpYKMIw3fW6DYxBJEv8oboh+PbZQ=" + }, + "xmlRev": "ae7424d3f40bf60b3906b5b9b472cb9a7209a3a8" } }, "50.15": { @@ -96,12 +116,12 @@ } }, "therapist": { - "version": "42.1.13", - "maxDfVersion": "51.11", + "version": "42.1.18", + "maxDfVersion": "52.03", "git": { "url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git", - "revision": "v42.1.13", - "outputHash": "sha256-y/kUur/BTArznrEzw54FZBrxnD2KXHcwfrHE4WvoemA=" + "revision": "v42.1.18", + "outputHash": "sha256-RdBUpVkjvsNjTowHpQ2FQUCtJiwfqls4dnoUIwKoXGg=" } } } From 072fd2537859a9b8c2e5287a2e0a0a840b0be137 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 23 Aug 2025 17:37:23 -0700 Subject: [PATCH 07/22] dfhack: support 52.03 52.03 uses SDL functions for figuring out the Dwarf Fortress base directory for storing saves. Make sure it uses one outside the store. --- pkgs/games/dwarf-fortress/dfhack/default.nix | 19 +++++--------- .../dfhack/use-df-linux-dir.patch | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index a97439344ab0..18c080f9d510 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -120,23 +120,16 @@ stdenv.mkDerivation { name = "rename-lerp.patch"; url = "https://github.com/DFHack/dfhack/commit/389dcf5cfcdb8bfb8deeb05fa5756c9f4f5709d1.patch"; hash = "sha256-QuDtGURhP+nM+x+8GIKO5LrMcmBkl9JSHHIeqzqGIPQ="; - }); + }) + # Newer versions use SDL_GetBasePath and SDL_GetPrefPath with a Windows-esque directory + # that mismatches where we have historically stored data in nixpkgs: + # https://github.com/libsdl-org/SDL/blob/release-2.24.x/src/filesystem/unix/SDL_sysfilesystem.c#L136 + # Use SDL_GetPrefPath since this takes XDG_DATA_HOME into account (which is correct). + ++ optional (versionAtLeast version "52.02-r2") ./use-df-linux-dir.patch; # gcc 11 fix CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive"; - # As of - # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, - # dfhack gets its goodies from the directory above the Dwarf_Fortress - # executable, which leads to stock Dwarf Fortress and not the built - # environment where all the dfhack resources are symlinked to (typically - # ~/.local/share/df_linux). This causes errors like `tweak is not a - # recognized command` to be reported and dfhack to lose some of its - # functionality. - postPatch = '' - sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp - ''; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch b/pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch new file mode 100644 index 000000000000..8b8fcabfdd62 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch @@ -0,0 +1,25 @@ +diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp +index 7a6b09a50..d5827f016 100644 +--- a/library/modules/Filesystem.cpp ++++ b/library/modules/Filesystem.cpp +@@ -232,17 +232,10 @@ std::filesystem::path Filesystem::canonicalize(std::filesystem::path p) noexcept + + std::filesystem::path Filesystem::getInstallDir() noexcept + { +- return std::filesystem::path{ DFSDL::DFSDL_GetBasePath() }; ++ return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") }; + } + + std::filesystem::path Filesystem::getBaseDir() noexcept + { +- auto getsavebase = []() { +- // assume portable mode is _on_ if init is missing +- if (!df::global::init || df::global::init->media.flag.is_set(df::enums::init_media_flags::PORTABLE_MODE)) +- return DFSDL::DFSDL_GetBasePath(); +- else +- return DFSDL::DFSDL_GetPrefPath("Bay 12 Games", "Dwarf Fortress"); +- }; +- return std::filesystem::path{ getsavebase() }; ++ return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") }; + } + From b290ef5c7b86c12d55919d02abe97c51312a8a31 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 4 Sep 2025 00:19:47 -0700 Subject: [PATCH 08/22] dwarf-therapist: fix memory map extraction for version 52.03 --- pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index c07d48d26e72..b70fb9316333 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -74,9 +74,10 @@ stdenv.mkDerivation { local orig_md5="$2" local patched_md5="$3" echo "It doesn't support DF $dfVersion out of the box, so we're doing it the hard way." - export NIXPKGS_DF_HOME="$(mktemp -dt dfhack.XXXXXX)" + export HOME="$(mktemp -dt dfhack.XXXXXX)" + export XDG_DATA_HOME="$HOME/.local/share" expect ${dfHackExpectScript} - local ini="$NIXPKGS_DF_HOME/therapist.ini" + local ini="$XDG_DATA_HOME/df_linux/therapist.ini" if [ -f "$ini" ]; then if grep -q "$patched_md5" "$ini"; then cp -v "$ini" "$output" From 2466ef16e1ac49a227d04d3e760a0c3c503f0b66 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 6 Sep 2025 08:11:14 +0000 Subject: [PATCH 09/22] apacheKafka: 4_1: init at 4.1.0 --- nixos/tests/kafka/base.nix | 1 + pkgs/servers/apache-kafka/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix index 961511525cdd..e2d9c9edfa8a 100644 --- a/nixos/tests/kafka/base.nix +++ b/nixos/tests/kafka/base.nix @@ -131,5 +131,6 @@ with pkgs; mode = "zookeeper"; }; kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; }; + kafka_4_1 = makeKafkaTest "kafka_4_1" { kafkaPackage = apacheKafka_4_1; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 0e7bcb3768c8..a9e54e7a8f4f 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -14,6 +14,13 @@ let versionMap = { + "4_1" = { + kafkaVersion = "4.1.0"; + scalaVersion = "2.13"; + sha256 = "sha256-hbRThHDR3LmNAnMoa/q4cXBlUi5Zfs//zU24OjAhdY4="; + jre = jdk17_headless; + nixosTest = nixosTests.kafka.base.kafka_4_1; + }; "4_0" = { kafkaVersion = "4.0.0"; scalaVersion = "2.13"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a6dc406c57f..881e2562ffee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6468,9 +6468,10 @@ with pkgs; apacheKafka_3_8 apacheKafka_3_9 apacheKafka_4_0 + apacheKafka_4_1 ; - apacheKafka = apacheKafka_4_0; + apacheKafka = apacheKafka_4_1; asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { }; From 8e3552324810cc2ff6faf05e50f40b2e444de315 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 10:22:30 +0000 Subject: [PATCH 10/22] starlark: 0-unstable-2025-08-04 -> 0-unstable-2025-09-06 --- pkgs/by-name/st/starlark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 61f58ec128f8..6ce52ceafc6a 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-08-04"; + version = "0-unstable-2025-09-06"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "3c9dc17c5f2e062f7d7b8b4237e571810e9c6445"; - hash = "sha256-hNP2kt6X46WpyQ4eDFU+mGP4x5H6sD3PC+BRD3AUgbo="; + rev = "bf296ed553ea1715656054a7f64ac6a6dd161360"; + hash = "sha256-ijZvmR9oFsIvpindO1RSi01USr2bhBATvVEQtYlgP/A="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; From 9db2353e98698fac9bdda5ac22eb41d9df526905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 11:21:26 +0000 Subject: [PATCH 11/22] filebeat8: 8.19.2 -> 8.19.3 --- pkgs/by-name/fi/filebeat8/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index e39c1a6da7db..89d3b95ec2ec 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "filebeat"; - version = "8.19.2"; + version = "8.19.3"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-3SW4SHUbEhdsKh3zd9VlVC8ZAxaR52Mfm1K/btjtB/4="; + hash = "sha256-bw/qWsNT4tG+hUjeb+DXaTxDY6HEL/A9iANFLdbyi5E="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-y8oAeH6RBD45+NEhl9EF4tPL1Ox4qHlLi+jSetjgKRE="; + vendorHash = "sha256-t+rCXm2eIG2a5xW1E8SjRAb/w9OuFKC/PyCGpJP8Szc="; subPackages = [ "filebeat" ]; From ef04fad53f3718c4e8ba820271c5918a0a53fc90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 12:47:01 +0000 Subject: [PATCH 12/22] mirrord: 3.159.0 -> 3.161.0 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index f8682bf37d2d..4730e74aef70 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.159.0", + "version": "3.161.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_x86_64", - "hash": "sha256-QwoilxsUmUDaYbIJLOhERbRgrrCN/M1sp4BvJsMWtOQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_linux_x86_64", + "hash": "sha256-Oqk1ITUcFqs2hM3Ph/2MjWmAeyU3jzfoDzZUHRXOyHQ=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_linux_aarch64", - "hash": "sha256-/4VACn2xOwDBjKca8gO2syuw6foDQNyqZCECiPNeT2M=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_linux_aarch64", + "hash": "sha256-9BWLLkUGc65nMfaJ3GUXN3/9hI+RVA5lVcDTT+ZMCMw=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal", - "hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_mac_universal", + "hash": "sha256-ak2DrNudwZWxy8RoPxc9+lLuU4LqCPa86/7DQrndVdk=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.159.0/mirrord_mac_universal", - "hash": "sha256-l/ZlUNzmp1/JBufNTbBD7yPUtHTCaU1gBOzX4GzHrq0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.161.0/mirrord_mac_universal", + "hash": "sha256-ak2DrNudwZWxy8RoPxc9+lLuU4LqCPa86/7DQrndVdk=" } } } From 996ba05a818f7fdfd0015aacec51b4629a8232aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 17:22:19 +0000 Subject: [PATCH 13/22] s7: 11.5-unstable-2025-08-26 -> 11.5-unstable-2025-09-06 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 046389e254ce..100df45b8da3 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.5-unstable-2025-08-26"; + version = "11.5-unstable-2025-09-06"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "f2abd58b4311e3f873619a6da1e65c5ad3d81943"; - hash = "sha256-4si8ObGNeM+grMR83pXppm50HZrw01tayQLePhwNRhk="; + rev = "cc2781b08764f820a3b9dc7dfbbc40505a3131db"; + hash = "sha256-8hwCzoELeDsnIz+XvfHHyRov4KajqCe1icI8uobrbDk="; }; buildInputs = From 514d7e017664f481d5334ad7c80dcaa77382be07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 21:31:16 +0000 Subject: [PATCH 14/22] python3Packages.weaviate-client: 4.16.5 -> 4.16.9 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 9a5ada4dc0f3..6ce17cffc8e6 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.16.5"; + version = "4.16.9"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-AjZZ9kmVxePlomX6bXUohZZXl2IXMbrjG00qNlGdjRc="; + hash = "sha256-vnBBZUUTv8GVPxjkxqKgTYA9/UaJ7VPr9QoRBIBVek8="; }; pythonRelaxDeps = [ From 2adb9c0f067635cd0e7b700fe6b5cfe54bd1329e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 22:32:25 +0000 Subject: [PATCH 15/22] cursor-cli: 0-unstable-2025-08-27 -> 0-unstable-2025-09-04 --- pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 2c8cec75cc57..4226a3b42bd5 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -9,26 +9,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-046NAHLckWOvIG5WJ8p3SNiUTbelEw2eTZ+/1DvTpNY="; + url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-Y1ynrrHfhbmMKkbZ1C3Xl+uZy3AWnmAXwTC+OkMcquc="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-Ft/7AivBm3VWsgtYAE0a9SqDLzuiFnGUTdEjsBZjUDA="; + url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-EeeHCWFDCayFGpSKkeHxZe2JSHsQ+hJYAwepTm6i8Bo="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-lgn7gaiItLzvhh7ePtUcDCqPuZFUWE3WDSzn5TY3Taw="; + url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-yzu0Ea5/X38RGyaFx0VR1O2aXzWs/XHopDyQzouFXP8="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2025.08.27-24c29c1/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-+zC4rTzTCj1MSCYA///6Br82SffTRdICHuhnhaXsAWg="; + url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-C2av4foh8XcXi+CYzFEz6jeFIR7sTjZFi1fk2s0I46I="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2025-08-27"; + version = "0-unstable-2025-09-04"; src = sources.${hostPlatform.system}; From 66c4c6253a432cbddc49fbe5345beb94fe2588fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 22:50:41 +0000 Subject: [PATCH 16/22] buf: 1.56.0 -> 1.57.0 --- pkgs/by-name/bu/buf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index d9079a7e0036..6fee36fe5b2e 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buf"; - version = "1.56.0"; + version = "1.57.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2yU8KgMRNEz5fgFx/e0U6Hrtw53neeO5PWsTU8AV14="; + hash = "sha256-D1/VMlvaaYNKyd8Uh5BZot/NABYzEvdjxtVFeKF4+6o="; }; - vendorHash = "sha256-lWcqXMkOpa+bh40zH8LQ86mIbTAqB2mk8naN1oY7Xuc="; + vendorHash = "sha256-6DRuSHZnQZTDiVvPNKgAnEaG4Zb70EPdNr2N13BVJQ0="; patches = [ # Skip a test that requires networking to be available to work. From 4f342a1bcc74fdcc70a669d3b6103358bca16b9d Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 00:35:56 +0100 Subject: [PATCH 17/22] haskell.compiler.ghc{924,963,984}Binary: use `broken` for NCG check Fix availability checks on platforms where this would be false. --- pkgs/development/compilers/ghc/9.2.4-binary.nix | 3 +-- pkgs/development/compilers/ghc/9.6.3-binary.nix | 3 +-- pkgs/development/compilers/ghc/9.8.4-binary.nix | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index d867b7926684..2031babd4ebb 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -211,8 +211,6 @@ let in -assert import ./common-have-ncg.nix { inherit lib stdenv version; }; - stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; @@ -497,5 +495,6 @@ stdenv.mkDerivation { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; teams = [ lib.teams.haskell ]; + broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); }; } diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 1557cb48a3df..814c188be2da 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -210,8 +210,6 @@ let in -assert import ./common-have-ncg.nix { inherit lib stdenv version; }; - stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; @@ -471,5 +469,6 @@ stdenv.mkDerivation { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; teams = [ lib.teams.haskell ]; + broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); }; } diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index b691715f8795..11422665a057 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -224,8 +224,6 @@ let in -assert import ./common-have-ncg.nix { inherit lib stdenv version; }; - stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; @@ -486,5 +484,6 @@ stdenv.mkDerivation { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; maintainers = lib.teams.haskell.members; + broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); }; } From 518b5ba83d6234de804cd9a0e0f06c58edb1066f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 7 Sep 2025 20:25:58 -0400 Subject: [PATCH 18/22] anytype: mark as broken on darwin --- pkgs/by-name/an/anytype/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index bc26c9edb49c..f2132ac89cd5 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, buildNpmPackage, pkg-config, @@ -132,5 +133,6 @@ buildNpmPackage { "x86_64-darwin" "aarch64-darwin" ]; + broken = stdenv.hostPlatform.isDarwin; }; } From b52064b30972620345ee22170bb05403d2ab0450 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 7 Sep 2025 17:43:11 -0700 Subject: [PATCH 19/22] python3Packages.pyqt6: fix QtMultimediaWidgets QtMultimediaWidgets wasn't built due to a link error as QtMultimedia was missing from buildInputs. --- pkgs/development/python-modules/pyqt/6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 8671534aa7a1..492550a0eded 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -118,6 +118,7 @@ buildPythonPackage rec { qtquicktimeline ] # ++ lib.optional withConnectivity qtconnectivity + ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation ++ lib.optional withSerialPort qtserialport; From c68b80bdde16829f825e7a2c12786f845b094118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Sep 2025 02:19:13 +0000 Subject: [PATCH 20/22] basedpyright: 1.31.3 -> 1.31.4 --- pkgs/by-name/ba/basedpyright/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 971a6f5bbe9f..cb2f7bf294b7 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.31.3"; + version = "1.31.4"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-sk/jqTVWLnE0qP7iSZFTegOkfz8s0TenUlctDmAEVW4="; + hash = "sha256-Lv2wNqS32482jFThJ5dIqlyv/m8QzEHDdlCYs6wd9nY="; }; - npmDepsHash = "sha256-O7OypjSMxMEajJZOHOt1AJXChQQbGZ4u63g8agU95Qw="; + npmDepsHash = "sha256-D1/6H+7GXWeL3dWeXB4Ho5mzCCVzCQPVIPMJ+btF0k4="; npmWorkspace = "packages/pyright"; preBuild = '' From c9430de6455216cb7ed54b9e96f4cecefe83cd84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Sep 2025 02:48:29 +0000 Subject: [PATCH 21/22] txtpbfmt: 0-unstable-2025-06-27 -> 0-unstable-2025-09-03 --- pkgs/by-name/tx/txtpbfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix index 74e403bda000..1bf23708da18 100644 --- a/pkgs/by-name/tx/txtpbfmt/package.nix +++ b/pkgs/by-name/tx/txtpbfmt/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "txtpbfmt"; - version = "0-unstable-2025-06-27"; + version = "0-unstable-2025-09-03"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "f293424e46b51a8dc295a0edf0fe7217ebda2660"; - hash = "sha256-0fFQbzj4CZ78P7A3iTwNA6LHUDM0nwYM/mPwDOlV2Zo="; + rev = "cf07efcaeff78f7d945f844d506daf4cad5a9229"; + hash = "sha256-A/rmMtYLaTEkP02DLaYu/1nwaQ7EWacvcl0ri5Zx5zs="; }; vendorHash = "sha256-iWY0b6PAw9BhA8WrTEECnVAKWTGXuIiGvOi9uhJO4PI="; From 403640aa9ee256acdaebe931036ac9ce6842d86d Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 4 Sep 2025 14:36:49 +0200 Subject: [PATCH 22/22] rocqPackages.rocq-elpi: 3.0.0 -> 3.1.0 --- .../coq-modules/mathcomp-algebra-tactics/default.nix | 2 ++ pkgs/development/rocq-modules/rocq-elpi/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 8f28e77d2612..cc2f839e0cca 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -32,6 +32,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + (case (range "8.20" "9.1") (isGe "2.4") "1.2.7") (case (range "8.20" "9.1") (isGe "2.4") "1.2.6") (case (range "8.20" "9.1") (isGe "2.4") "1.2.5") (case (range "8.16" "9.0") (isGe "2.0") "1.2.4") @@ -48,6 +49,7 @@ mkCoqDerivation { release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q="; release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA="; release."1.2.6".sha256 = "sha256-D7EEiLeCJMgxsYvlAFyL7QZyx/KJAKesVE+vyfzqzkU="; + release."1.2.7".sha256 = "sha256-pCal3BPZ85SMAsEFAXRWWV7nuriHGWtyfNocJqsEmLk="; propagatedBuildInputs = [ mathcomp-ssreflect diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix index c19d42f7db19..66c07bce7d4f 100644 --- a/pkgs/development/rocq-modules/rocq-elpi/default.nix +++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix @@ -17,7 +17,7 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "9.0" "9.1") "3.0.1") + (case (range "9.0" "9.1") "3.3.0") (case (range "9.0" "9.1") "2.0.7") ] { }; elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; }; @@ -36,7 +36,7 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "9.0" "9.1") "3.0.0") + (case (range "9.0" "9.1") "3.1.0") (case (range "9.0" "9.1") "2.6.0") (case ("9.0") "2.5.2") ] null;