From 06f1997a259e9b2e94a4a6d980d770db9bfb7225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 18 Apr 2025 12:52:09 +0200
Subject: [PATCH 01/45] tantivy-go: 0.3.1 -> 1.0.1

---
 .../ta/tantivy-go/add-Cargo.lock.patch        | 700 +++++++++++-------
 pkgs/by-name/ta/tantivy-go/package.nix        |   6 +-
 2 files changed, 431 insertions(+), 275 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 9b974186d55b..50fa59c32807 100644
--- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
+++ b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
@@ -1,12 +1,12 @@
 diff --git a/rust/Cargo.lock b/rust/Cargo.lock
 new file mode 100644
-index 0000000..942397e
+index 0000000..7cb3275
 --- /dev/null
 +++ b/rust/Cargo.lock
-@@ -0,0 +1,1609 @@
+@@ -0,0 +1,1762 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
-+version = 3
++version = 4
 +
 +[[package]]
 +name = "adler32"
@@ -23,7 +23,7 @@ index 0000000..942397e
 + "cfg-if",
 + "once_cell",
 + "version_check",
-+ "zerocopy",
++ "zerocopy 0.7.35",
 +]
 +
 +[[package]]
@@ -82,11 +82,12 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "anstyle-wincon"
-+version = "3.0.6"
++version = "3.0.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
++checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 +dependencies = [
 + "anstyle",
++ "once_cell",
 + "windows-sys 0.59.0",
 +]
 +
@@ -98,13 +99,13 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "async-trait"
-+version = "0.1.83"
++version = "0.1.88"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
++checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
@@ -121,9 +122,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "bitflags"
-+version = "2.6.0"
++version = "2.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 +
 +[[package]]
 +name = "bitpacking"
@@ -135,10 +136,29 @@ index 0000000..942397e
 +]
 +
 +[[package]]
-+name = "bumpalo"
-+version = "3.16.0"
++name = "bon"
++version = "3.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
++checksum = "94054366e2ff97b455acdd4fdb03913f717febc57b7bbd1741b2c3b87efae030"
++dependencies = [
++ "bon-macros",
++ "rustversion",
++]
++
++[[package]]
++name = "bon-macros"
++version = "3.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "542a990e676ce0a0a895ae54b2d94afd012434f2228a85b186c6bc1a7056cdc6"
++dependencies = [
++ "darling",
++ "ident_case",
++ "prettyplease",
++ "proc-macro2",
++ "quote",
++ "rustversion",
++ "syn 2.0.100",
++]
 +
 +[[package]]
 +name = "byteorder"
@@ -148,9 +168,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "cbindgen"
-+version = "0.27.0"
++version = "0.28.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
++checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
 +dependencies = [
 + "clap",
 + "heck",
@@ -160,16 +180,16 @@ index 0000000..942397e
 + "quote",
 + "serde",
 + "serde_json",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 + "tempfile",
 + "toml",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.2.6"
++version = "1.2.19"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
++checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
 +dependencies = [
 + "jobserver",
 + "libc",
@@ -199,18 +219,18 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "clap"
-+version = "4.5.23"
++version = "4.5.36"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
++checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
 +dependencies = [
 + "clap_builder",
 +]
 +
 +[[package]]
 +name = "clap_builder"
-+version = "4.5.23"
++version = "4.5.36"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
++checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
 +dependencies = [
 + "anstream",
 + "anstyle",
@@ -250,9 +270,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "crossbeam-channel"
-+version = "0.5.14"
++version = "0.5.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
++checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 +dependencies = [
 + "crossbeam-utils",
 +]
@@ -289,6 +309,41 @@ index 0000000..942397e
 +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 +
 +[[package]]
++name = "darling"
++version = "0.20.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
++dependencies = [
++ "darling_core",
++ "darling_macro",
++]
++
++[[package]]
++name = "darling_core"
++version = "0.20.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
++dependencies = [
++ "fnv",
++ "ident_case",
++ "proc-macro2",
++ "quote",
++ "strsim",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "darling_macro"
++version = "0.20.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
++dependencies = [
++ "darling_core",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
 +name = "dary_heap"
 +version = "0.3.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -296,9 +351,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "deranged"
-+version = "0.3.11"
++version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 +dependencies = [
 + "powerfmt",
 + "serde",
@@ -306,15 +361,15 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "downcast-rs"
-+version = "1.2.1"
++version = "2.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
++checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
 +
 +[[package]]
 +name = "either"
-+version = "1.13.0"
++version = "1.15.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 +
 +[[package]]
 +name = "env_filter"
@@ -328,28 +383,28 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "env_logger"
-+version = "0.11.6"
++version = "0.11.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
++checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
 +dependencies = [
 + "anstream",
 + "anstyle",
 + "env_filter",
-+ "humantime",
++ "jiff",
 + "log",
 +]
 +
 +[[package]]
 +name = "equivalent"
-+version = "1.0.1"
++version = "1.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 +
 +[[package]]
 +name = "errno"
-+version = "0.3.10"
++version = "0.3.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 +dependencies = [
 + "libc",
 + "windows-sys 0.59.0",
@@ -375,9 +430,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "foldhash"
-+version = "0.1.4"
++version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 +
 +[[package]]
 +name = "fs4"
@@ -385,11 +440,48 @@ index 0000000..942397e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8"
 +dependencies = [
-+ "rustix",
++ "rustix 0.38.44",
 + "windows-sys 0.52.0",
 +]
 +
 +[[package]]
++name = "futures-core"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
++
++[[package]]
++name = "futures-macro"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "futures-task"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
++
++[[package]]
++name = "futures-util"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
++dependencies = [
++ "futures-core",
++ "futures-macro",
++ "futures-task",
++ "pin-project-lite",
++ "pin-utils",
++ "slab",
++]
++
++[[package]]
 +name = "fxhash"
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -406,7 +498,19 @@ index 0000000..942397e
 +dependencies = [
 + "cfg-if",
 + "libc",
-+ "wasi",
++ "wasi 0.11.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "r-efi",
++ "wasi 0.14.2+wasi-0.2.4",
 +]
 +
 +[[package]]
@@ -437,22 +541,25 @@ index 0000000..942397e
 +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 +
 +[[package]]
-+name = "hermit-abi"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-+
-+[[package]]
 +name = "htmlescape"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
 +
 +[[package]]
-+name = "humantime"
-+version = "2.1.0"
++name = "hyperloglogplus"
++version = "0.4.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
++checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "ident_case"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 +
 +[[package]]
 +name = "include-flate"
@@ -474,32 +581,20 @@ index 0000000..942397e
 + "libflate",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
 +name = "indexmap"
-+version = "2.7.0"
++version = "2.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
++checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 +dependencies = [
 + "equivalent",
 + "hashbrown 0.15.2",
 +]
 +
 +[[package]]
-+name = "instant"
-+version = "0.1.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-+dependencies = [
-+ "cfg-if",
-+ "js-sys",
-+ "wasm-bindgen",
-+ "web-sys",
-+]
-+
-+[[package]]
 +name = "is_terminal_polyfill"
 +version = "1.70.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -507,18 +602,18 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "itertools"
-+version = "0.12.1"
++version = "0.14.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 +dependencies = [
 + "either",
 +]
 +
 +[[package]]
 +name = "itoa"
-+version = "1.0.14"
++version = "1.0.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 +
 +[[package]]
 +name = "jieba-macros"
@@ -531,9 +626,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "jieba-rs"
-+version = "0.7.1"
++version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9a77d0ae8831f870c4f6ffce310f708b5273ea2e7a88e6af770a10d1b4876311"
++checksum = "6d1bcad6332969e4d48ee568d430e14ee6dea70740c2549d005d87677ebefb0c"
 +dependencies = [
 + "cedarwood",
 + "fxhash",
@@ -545,22 +640,37 @@ index 0000000..942397e
 +]
 +
 +[[package]]
-+name = "jobserver"
-+version = "0.1.32"
++name = "jiff"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
++checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0"
 +dependencies = [
-+ "libc",
++ "jiff-static",
++ "log",
++ "portable-atomic",
++ "portable-atomic-util",
++ "serde",
 +]
 +
 +[[package]]
-+name = "js-sys"
-+version = "0.3.76"
++name = "jiff-static"
++version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
++checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605"
 +dependencies = [
-+ "once_cell",
-+ "wasm-bindgen",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "jobserver"
++version = "0.1.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
++dependencies = [
++ "getrandom 0.3.2",
++ "libc",
 +]
 +
 +[[package]]
@@ -577,9 +687,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.169"
++version = "0.2.172"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 +
 +[[package]]
 +name = "libflate"
@@ -613,15 +723,21 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "linux-raw-sys"
-+version = "0.4.14"
++version = "0.4.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
++checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
++
++[[package]]
++name = "linux-raw-sys"
++version = "0.9.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 +
 +[[package]]
 +name = "log"
-+version = "0.4.22"
++version = "0.4.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
++checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 +
 +[[package]]
 +name = "logcall"
@@ -632,7 +748,7 @@ index 0000000..942397e
 + "proc-macro-error",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
@@ -652,11 +768,10 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "measure_time"
-+version = "0.8.3"
++version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc"
++checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e"
 +dependencies = [
-+ "instant",
 + "log",
 +]
 +
@@ -714,50 +829,40 @@ index 0000000..942397e
 +]
 +
 +[[package]]
-+name = "num_cpus"
-+version = "1.16.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-+dependencies = [
-+ "hermit-abi",
-+ "libc",
-+]
-+
-+[[package]]
 +name = "once_cell"
-+version = "1.20.2"
++version = "1.21.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 +
 +[[package]]
 +name = "oneshot"
-+version = "0.1.8"
++version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29"
++checksum = "b4ce411919553d3f9fa53a0880544cda985a112117a0444d5ff1e870a893d6ea"
 +
 +[[package]]
 +name = "ownedbytes"
 +version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "stable_deref_trait",
 +]
 +
 +[[package]]
 +name = "phf"
-+version = "0.11.2"
++version = "0.11.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
++checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 +dependencies = [
++ "phf_macros",
 + "phf_shared",
 +]
 +
 +[[package]]
 +name = "phf_codegen"
-+version = "0.11.2"
++version = "0.11.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
++checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 +dependencies = [
 + "phf_generator",
 + "phf_shared",
@@ -765,28 +870,68 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "phf_generator"
-+version = "0.11.2"
++version = "0.11.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
++checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 +dependencies = [
 + "phf_shared",
 + "rand",
 +]
 +
 +[[package]]
-+name = "phf_shared"
-+version = "0.11.2"
++name = "phf_macros"
++version = "0.11.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
++checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
++dependencies = [
++ "phf_generator",
++ "phf_shared",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "phf_shared"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 +dependencies = [
 + "siphasher",
 +]
 +
 +[[package]]
-+name = "pkg-config"
-+version = "0.3.31"
++name = "pin-project-lite"
++version = "0.2.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
++
++[[package]]
++name = "pin-utils"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.32"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
++
++[[package]]
++name = "portable-atomic"
++version = "1.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
++
++[[package]]
++name = "portable-atomic-util"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
++dependencies = [
++ "portable-atomic",
++]
 +
 +[[package]]
 +name = "powerfmt"
@@ -796,11 +941,21 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "ppv-lite86"
-+version = "0.2.20"
++version = "0.2.21"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 +dependencies = [
-+ "zerocopy",
++ "zerocopy 0.8.24",
++]
++
++[[package]]
++name = "prettyplease"
++version = "0.2.32"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
++dependencies = [
++ "proc-macro2",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
@@ -829,23 +984,29 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "proc-macro2"
-+version = "1.0.92"
++version = "1.0.95"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
 +name = "quote"
-+version = "1.0.38"
++version = "1.0.40"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 +dependencies = [
 + "proc-macro2",
 +]
 +
 +[[package]]
++name = "r-efi"
++version = "5.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++
++[[package]]
 +name = "rand"
 +version = "0.8.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -872,7 +1033,7 @@ index 0000000..942397e
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 +dependencies = [
-+ "getrandom",
++ "getrandom 0.2.15",
 +]
 +
 +[[package]]
@@ -943,63 +1104,77 @@ index 0000000..942397e
 +[[package]]
 +name = "rust-stemmers"
 +version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
-+dependencies = [
-+ "serde",
-+ "serde_derive",
-+]
++source = "git+https://github.com/silver-ymz/rust-stemmers.git?rev=51696378e352688b7ffd4fface615370ff5e8768#51696378e352688b7ffd4fface615370ff5e8768"
 +
 +[[package]]
 +name = "rustc-hash"
-+version = "1.1.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 +
 +[[package]]
 +name = "rustix"
-+version = "0.38.42"
++version = "0.38.44"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 +dependencies = [
 + "bitflags",
 + "errno",
 + "libc",
-+ "linux-raw-sys",
++ "linux-raw-sys 0.4.15",
 + "windows-sys 0.59.0",
 +]
 +
 +[[package]]
-+name = "ryu"
-+version = "1.0.18"
++name = "rustix"
++version = "1.0.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
++checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
++dependencies = [
++ "bitflags",
++ "errno",
++ "libc",
++ "linux-raw-sys 0.9.4",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "rustversion"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++
++[[package]]
++name = "ryu"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 +
 +[[package]]
 +name = "serde"
-+version = "1.0.217"
++version = "1.0.219"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 +dependencies = [
 + "serde_derive",
 +]
 +
 +[[package]]
 +name = "serde_derive"
-+version = "1.0.217"
++version = "1.0.219"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
 +name = "serde_json"
-+version = "1.0.134"
++version = "1.0.140"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 +dependencies = [
 + "itoa",
 + "memchr",
@@ -1024,24 +1199,33 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "siphasher"
-+version = "0.3.11"
++version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
++checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 +
 +[[package]]
 +name = "sketches-ddsketch"
-+version = "0.2.2"
++version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
++checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
 +dependencies = [
 + "serde",
 +]
 +
 +[[package]]
-+name = "smallvec"
-+version = "1.13.2"
++name = "slab"
++version = "0.4.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 +
 +[[package]]
 +name = "stable_deref_trait"
@@ -1067,9 +1251,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "syn"
-+version = "2.0.93"
++version = "2.0.100"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -1078,14 +1262,14 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "tantivy"
-+version = "0.22.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856"
++version = "0.23.0"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "aho-corasick",
 + "arc-swap",
 + "base64",
 + "bitpacking",
++ "bon",
 + "byteorder",
 + "census",
 + "crc32fast",
@@ -1095,6 +1279,7 @@ index 0000000..942397e
 + "fnv",
 + "fs4",
 + "htmlescape",
++ "hyperloglogplus",
 + "itertools",
 + "levenshtein_automata",
 + "log",
@@ -1102,7 +1287,6 @@ index 0000000..942397e
 + "lz4_flex",
 + "measure_time",
 + "memmap2",
-+ "num_cpus",
 + "once_cell",
 + "oneshot",
 + "rayon",
@@ -1130,8 +1314,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-bitpacker"
 +version = "0.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "bitpacking",
 +]
@@ -1139,8 +1322,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-columnar"
 +version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "downcast-rs",
 + "fastdivide",
@@ -1155,8 +1337,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-common"
 +version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "async-trait",
 + "byteorder",
@@ -1178,13 +1359,15 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "tantivy-go"
-+version = "0.2.0"
++version = "1.0.0"
 +dependencies = [
 + "cbindgen",
++ "crunchy",
 + "env_logger",
 + "lazy_static",
 + "log",
 + "logcall",
++ "phf",
 + "serde",
 + "serde_json",
 + "tantivy",
@@ -1195,8 +1378,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-jieba"
 +version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0f2fe65c125f0d76d06f0f2ce9fbb9287b53f0dafb51a6270d984a840e2f16c1"
++source = "git+https://github.com/anyproto/tantivy-jieba.git?rev=ca11d3153b8844cbc43cd243667e03f56f6d1e18#ca11d3153b8844cbc43cd243667e03f56f6d1e18"
 +dependencies = [
 + "jieba-rs",
 + "lazy_static",
@@ -1206,8 +1388,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-query-grammar"
 +version = "0.22.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "nom",
 +]
@@ -1215,9 +1396,10 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-sstable"
 +version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
++ "futures-util",
++ "itertools",
 + "tantivy-bitpacker",
 + "tantivy-common",
 + "tantivy-fst",
@@ -1227,8 +1409,7 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-stacker"
 +version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "murmurhash32",
 + "rand_distr",
@@ -1238,50 +1419,49 @@ index 0000000..942397e
 +[[package]]
 +name = "tantivy-tokenizer-api"
 +version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04"
++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e"
 +dependencies = [
 + "serde",
 +]
 +
 +[[package]]
 +name = "tempfile"
-+version = "3.14.0"
++version = "3.19.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
++checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 +dependencies = [
-+ "cfg-if",
 + "fastrand",
++ "getrandom 0.3.2",
 + "once_cell",
-+ "rustix",
++ "rustix 1.0.5",
 + "windows-sys 0.59.0",
 +]
 +
 +[[package]]
 +name = "thiserror"
-+version = "1.0.69"
++version = "2.0.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
++checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 +dependencies = [
 + "thiserror-impl",
 +]
 +
 +[[package]]
 +name = "thiserror-impl"
-+version = "1.0.69"
++version = "2.0.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
++checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "syn 2.0.100",
 +]
 +
 +[[package]]
 +name = "time"
-+version = "0.3.37"
++version = "0.3.41"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
++checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 +dependencies = [
 + "deranged",
 + "itoa",
@@ -1294,15 +1474,15 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "time-core"
-+version = "0.1.2"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 +
 +[[package]]
 +name = "time-macros"
-+version = "0.2.19"
++version = "0.2.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
++checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 +dependencies = [
 + "num-conv",
 + "time-core",
@@ -1310,9 +1490,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "toml"
-+version = "0.8.19"
++version = "0.8.20"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
++checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 +dependencies = [
 + "serde",
 + "serde_spanned",
@@ -1331,9 +1511,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "toml_edit"
-+version = "0.22.22"
++version = "0.22.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
++checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 +dependencies = [
 + "indexmap",
 + "serde",
@@ -1344,9 +1524,9 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "unicode-ident"
-+version = "1.0.14"
++version = "1.0.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 +
 +[[package]]
 +name = "unicode-segmentation"
@@ -1368,11 +1548,11 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "uuid"
-+version = "1.11.0"
++version = "1.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
++checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 +dependencies = [
-+ "getrandom",
++ "getrandom 0.3.2",
 + "serde",
 +]
 +
@@ -1389,67 +1569,12 @@ index 0000000..942397e
 +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 +
 +[[package]]
-+name = "wasm-bindgen"
-+version = "0.2.99"
++name = "wasi"
++version = "0.14.2+wasi-0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 +dependencies = [
-+ "cfg-if",
-+ "once_cell",
-+ "wasm-bindgen-macro",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-backend"
-+version = "0.2.99"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
-+dependencies = [
-+ "bumpalo",
-+ "log",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.93",
-+ "wasm-bindgen-shared",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-macro"
-+version = "0.2.99"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
-+dependencies = [
-+ "quote",
-+ "wasm-bindgen-macro-support",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-macro-support"
-+version = "0.2.99"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.93",
-+ "wasm-bindgen-backend",
-+ "wasm-bindgen-shared",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-shared"
-+version = "0.2.99"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
-+
-+[[package]]
-+name = "web-sys"
-+version = "0.3.76"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
-+dependencies = [
-+ "js-sys",
-+ "wasm-bindgen",
++ "wit-bindgen-rt",
 +]
 +
 +[[package]]
@@ -1558,21 +1683,38 @@ index 0000000..942397e
 +
 +[[package]]
 +name = "winnow"
-+version = "0.6.20"
++version = "0.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
++checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 +dependencies = [
 + "memchr",
 +]
 +
 +[[package]]
++name = "wit-bindgen-rt"
++version = "0.39.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
 +name = "zerocopy"
 +version = "0.7.35"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 +dependencies = [
-+ "byteorder",
-+ "zerocopy-derive",
++ "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",
 +]
 +
 +[[package]]
@@ -1583,33 +1725,47 @@ index 0000000..942397e
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.93",
++ "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",
 +]
 +
 +[[package]]
 +name = "zstd"
-+version = "0.13.2"
++version = "0.13.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
++checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 +dependencies = [
 + "zstd-safe",
 +]
 +
 +[[package]]
 +name = "zstd-safe"
-+version = "7.2.1"
++version = "7.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
++checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 +dependencies = [
 + "zstd-sys",
 +]
 +
 +[[package]]
 +name = "zstd-sys"
-+version = "2.0.13+zstd.1.5.6"
++version = "2.0.15+zstd.1.5.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
++checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 +dependencies = [
 + "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 53cbb9e75085..0f839fdce3cf 100644
--- a/pkgs/by-name/ta/tantivy-go/package.nix
+++ b/pkgs/by-name/ta/tantivy-go/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tantivy-go";
-  version = "0.3.1";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "tantivy-go";
     tag = "v${version}";
-    hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY=";
+    hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE=";
+  cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY=";
 
   cargoPatches = [
     ./add-Cargo.lock.patch

From e88e8830e00eaac9bc7d4e2a80be01cd15d46ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 18 Apr 2025 12:52:32 +0200
Subject: [PATCH 02/45] anytype-heart: 0.39.11 -> 0.40.19

---
 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 6b2f2472a473..787c9dc93826 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "anytype-heart";
-  version = "0.39.11";
+  version = "0.40.19";
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-heart";
     tag = "v${version}";
-    hash = "sha256-+H63bc4aJPERfclzKh4E3uYEEwNycLfe0BCPSlilqCc=";
+    hash = "sha256-BUQZmZ7jKWdbBcWtx7rbbeEJbo5FncYHmp/5FVd0vdI=";
   };
 
   arch =
@@ -34,7 +34,7 @@ in
 buildGoModule {
   inherit pname version src;
 
-  vendorHash = "sha256-fbZ1DiRcD9dnS8e7BMrKPYApqZmQbaH6DsSSO1knDmo=";
+  vendorHash = "sha256-xsxgeoS1wIi0/LNGmZZyWKWzhkMJUnCEslXcIz+Dw8U=";
 
   subPackages = [ "cmd/grpcserver" ];
   tags = [

From 07ee7aabd7e3d8616fa973e40d1941e5a79ca022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 18 Apr 2025 12:53:30 +0200
Subject: [PATCH 03/45] anytype: 0.45.3 -> 0.46.4

---
 pkgs/by-name/an/anytype/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index d6a5bea3143e..a923faacf42b 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -15,27 +15,27 @@
 
 let
   pname = "anytype";
-  version = "0.45.3";
+  version = "0.46.4";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-ts";
     tag = "v${version}";
-    hash = "sha256-fwfxmNca75xAAHKeT2nddz+XZexDomzHbw188LXxZqA=";
+    hash = "sha256-JA8DHOPRLPoc8/GXkHfktVy3sZ5BpSFmgn71Xt15iLE=";
   };
   description = "P2P note-taking tool";
 
   locales = fetchFromGitHub {
     owner = "anyproto";
     repo = "l10n-anytype-ts";
-    rev = "687106c4e37297f86fab79f77ef83599b61ab65c";
-    hash = "sha256-Y0irD0jzqYobnjtD2M1+hTDRUUYnuygUx9+tE1gUoTw=";
+    rev = "07eed415b0eec409dcdfedf848936d41f190c7ec";
+    hash = "sha256-PgDZkL/tg7/uZhLLenRjkb5NB1hQjUJflaAce2TlDRE=";
   };
 in
 buildNpmPackage {
   inherit pname version src;
 
-  npmDepsHash = "sha256-9BI+rXzTYonlMhcH8uiWyyF18JGv8GL1U9hZ9Z6X3As=";
+  npmDepsHash = "sha256-4pMYKmQ7+f8BKztLF4Jfe89tuh+DiQNnS3ulL0i6Gw0=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

From 387f7ec950a3d9171cc972708c15c401b538b796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 25 Apr 2025 12:38:37 +0200
Subject: [PATCH 04/45] anytype: Disable auto checking for updates and updating
 manually

---
 ...ng-for-updates-and-updating-manually.patch | 37 +++++++++++++++++++
 pkgs/by-name/an/anytype/package.nix           |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch

diff --git a/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
new file mode 100644
index 000000000000..7931ec439968
--- /dev/null
+++ b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
@@ -0,0 +1,37 @@
+From d236396b1da80a7233168e01e8164256e7f69cc1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
+Date: Fri, 25 Apr 2025 12:29:37 +0200
+Subject: [PATCH] feat(update): Disable auto checking for updates and updating
+ manually
+
+---
+ electron/js/update.js | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/electron/js/update.js b/electron/js/update.js
+index 0e34efa..9386c90 100644
+--- a/electron/js/update.js
++++ b/electron/js/update.js
+@@ -29,7 +29,8 @@ class UpdateManager {
+ 		autoUpdater.autoInstallOnAppQuit = false;
+ 		autoUpdater.channel = channel;
+ 
+-		this.setTimeout();
++		// PATCH(update): Never check for updates on a timer timeout.
++		// this.setTimeout();
+ 
+ 		autoUpdater.on('checking-for-update', () => {
+ 			Util.log('info', 'Checking for update');
+@@ -93,6 +94,9 @@ class UpdateManager {
+ 	};
+ 
+ 	isAllowed () {
++		// PATCH(update): Always disallow update check, even when requested by the user manually or when Anytype starts.
++		return false;
++
+ 		const { config } = ConfigManager;
+ 
+ 		if (config.updateDisabled) {
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index a923faacf42b..64cc2625f221 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -52,6 +52,10 @@ buildNpmPackage {
     "--nodedir=${electron.headers}"
   ];
 
+  patches = [
+    ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
+  ];
+
   buildPhase = ''
     runHook preBuild
 

From 7aa5920a811a1b901ba74983ad21302de4a68ea1 Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Fri, 25 Apr 2025 13:27:39 +0100
Subject: [PATCH 05/45] paretosecurity: 0.2.12 -> 0.2.13

---
 pkgs/by-name/pa/paretosecurity/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index ae4d21ec133e..c9b63a34b459 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,18 +17,23 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.12";
+  version = "0.2.13";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-skBxDPC+C8JU1CW6g3SA2C4IawaoPzVi8pdl5BCutUY=";
+    hash = "sha256-G2An1Br/NJcIEKaM/pPEGkJazD9UFypRZ/KLmqkNUTo=";
   };
 
   vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls=";
   proxyVendor = true;
 
+  # Skip building the Windows installer
+  preBuild = ''
+    rm -rf cmd/paretosecurity-installer
+  '';
+
   ldflags = [
     "-s"
     "-X=github.com/ParetoSecurity/agent/shared.Version=${finalAttrs.version}"

From 68cce8fdf474fd30ef784614e8b7307c06ae76ca Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@slab.com>
Date: Sun, 27 Apr 2025 18:10:13 -0600
Subject: [PATCH 06/45] ghostunnel: fix darwin build

---
 pkgs/by-name/gh/ghostunnel/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index 2a3221b08c9e..464da25dc643 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   lib,
   nixosTests,
+  apple-sdk_12,
+  darwinMinVersionHook,
 }:
 
 buildGoModule rec {
@@ -17,16 +19,20 @@ buildGoModule rec {
     hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo=";
 
   deleteVendor = true;
 
-  # The certstore directory isn't recognized as a subpackage, but is when moved
-  # into the vendor directory.
-  postUnpack = ''
-    mkdir -p $sourceRoot/vendor/ghostunnel
-    mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
-  '';
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_12
+    (darwinMinVersionHook "12.0")
+  ];
+
+  # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain
+  # which doesn't work from a nix build. Presumably other platform implementations of the
+  # certstore would have similar issues, so it probably makes sense to skip them in
+  # general wherever they are available.
+  checkFlags = [ "-skip=^Test(ImportDelete|Signer|Certificate)(RSA|ECDSA|EC)$" ];
 
   passthru.tests = {
     nixos = nixosTests.ghostunnel;
@@ -34,7 +40,6 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "TLS proxy with mutual authentication support for securing non-TLS backend applications";
     homepage = "https://github.com/ghostunnel/ghostunnel#readme";
     changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}";

From c27dd8a81571bafc2fee6493b52abdd76fd6feb9 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Sun, 27 Apr 2025 18:46:02 -0600
Subject: [PATCH 07/45] ghostunnel: add mjm as maintainer

---
 pkgs/by-name/gh/ghostunnel/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index 464da25dc643..4ad5562b358c 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -44,7 +44,10 @@ buildGoModule rec {
     homepage = "https://github.com/ghostunnel/ghostunnel#readme";
     changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ roberth ];
+    maintainers = with maintainers; [
+      roberth
+      mjm
+    ];
     mainProgram = "ghostunnel";
   };
 }

From e4f257660c2a29bb5b8fdbbdfc387ccb92ce8dab Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 30 Apr 2025 05:41:41 +0800
Subject: [PATCH 08/45] hcxdumptool: 6.3.2 -> 6.3.5

Diff: https://github.com/ZerBea/hcxdumptool/compare/6.3.2...6.3.5
---
 pkgs/by-name/hc/hcxdumptool/package.nix | 26 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/hc/hcxdumptool/package.nix b/pkgs/by-name/hc/hcxdumptool/package.nix
index 9072ec49a6c7..dda50597c05f 100644
--- a/pkgs/by-name/hc/hcxdumptool/package.nix
+++ b/pkgs/by-name/hc/hcxdumptool/package.nix
@@ -1,31 +1,35 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
   openssl,
+  libpcap,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hcxdumptool";
-  version = "6.3.2";
+  version = "6.3.5";
 
   src = fetchFromGitHub {
     owner = "ZerBea";
     repo = "hcxdumptool";
-    rev = version;
-    sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg=";
+    tag = finalAttrs.version;
+    hash = "sha256-PA4nbjg4ybWvZZ7wbsh+OR/wEEVm5qu5OfM9EO3HBYs=";
   };
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    libpcap
+  ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ZerBea/hcxdumptool";
     description = "Small tool to capture packets from wlan devices";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ danielfullmer ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ danielfullmer ];
     mainProgram = "hcxdumptool";
   };
-}
+})

From be6154f72655c21d1cdbed7aecb5e90c5e347f41 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Wed, 30 Apr 2025 15:30:27 +0800
Subject: [PATCH 09/45] maple-font: 7.1 -> 7.2

---
 pkgs/data/fonts/maple-font/default.nix |  2 +-
 pkgs/data/fonts/maple-font/hashes.json | 88 +++++++++++++-------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix
index de240b613f2c..735c86fb8bd5 100644
--- a/pkgs/data/fonts/maple-font/default.nix
+++ b/pkgs/data/fonts/maple-font/default.nix
@@ -17,7 +17,7 @@ let
     }:
     stdenv.mkDerivation rec {
       inherit pname;
-      version = "7.1";
+      version = "7.2";
       src = fetchurl {
         url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
         inherit hash;
diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json
index 08c01aaf4e80..64e5245f99ce 100644
--- a/pkgs/data/fonts/maple-font/hashes.json
+++ b/pkgs/data/fonts/maple-font/hashes.json
@@ -1,46 +1,46 @@
 {
-  "MapleMono-CN-unhinted": "sha256-D4B+KAkybvfVS+HztoYTCF+Qs9lxrh1de2bBPUBdO68=",
-  "MapleMono-CN": "sha256-63qfevuputeewEXaV5CbjSnOQ6tqXNPwN65BnkTXcf0=",
-  "MapleMono-NF-CN-unhinted": "sha256-qLqcdCL3uCDW6QDx+W39HcL3r303RNjEuEhiA38YRYU=",
-  "MapleMono-NF-CN": "sha256-9gxjsh9j7Tlc1Z5naK7PSppbViI6cZtlqk6/5Jhvt5E=",
-  "MapleMono-NF-unhinted": "sha256-hnELGz8zpQ/n2Pj3SWqduuflmIBhT+8Md6c5QMXhzd4=",
-  "MapleMono-NF": "sha256-ZzU+PgrazEziTx8ooNkkjqAPwFcM1EPQBRSkkm3C60I=",
-  "MapleMono-OTF": "sha256-Nxpv748064mp5Lz4lvdCUz9jWY78dVMOSlC1FBDOvws=",
-  "MapleMono-TTF-AutoHint": "sha256-R1ZNozNRHYtNXar96w3V1qkwbAOWCdMZMmhK7Dtyqs4=",
-  "MapleMono-TTF": "sha256-7aFMMCxreDD2KnpgIt/gcYAyp+pNEtdfSgT/4aOM/P8=",
-  "MapleMono-Variable": "sha256-FyaIAYpdDOj6IDLJUU33Yg7VqEK0VN/n92b2I4LrdcA=",
-  "MapleMono-Woff2": "sha256-lxcBjgmngFZ1UhBej3lE+IqKxvQoDE5rH3++h4CN0ac=",
-  "MapleMonoNL-CN-unhinted": "sha256-tkEEKNjHN/lveLvYtlP3EvmtKVnQMdaBFDe6c+fjtB8=",
-  "MapleMonoNL-CN": "sha256-D7Whkd1+qL5OwlAVIepscLqQwusbIWKwtg1C2vfC4yI=",
-  "MapleMonoNL-NF-CN-unhinted": "sha256-8MtWWxzrrLTdHsAB+vNWBN62TJ59Tr6pfmAsJVdk/KA=",
-  "MapleMonoNL-NF-CN": "sha256-58UpkirwaSTOgk0m5UoDL+1tAz4FzDD9f+zPUieqUkA=",
-  "MapleMonoNL-NF-unhinted": "sha256-6ImbXQwoXBQ9FDjB4qLPIwoi8wc+/AWc3P5ALZfkdE4=",
-  "MapleMonoNL-NF": "sha256-Lk8JBrLxwmonB7w4Je9evGM0wUjpgwIZ3Qj+IU/XZ1o=",
-  "MapleMonoNL-OTF": "sha256-Lcrde1I3SV6f7RYiyguK0w9wgRCn3Ra703xkB8gtqJ4=",
-  "MapleMonoNL-TTF-AutoHint": "sha256-++via+eB8KE/RQ6NpCXL3DsBuI/+U0IWMUZPvDQ1zuA=",
-  "MapleMonoNL-TTF": "sha256-B5z0KEnEis39A1sPj1bOZTfSdtwR4PJPfms84EiMYsQ=",
-  "MapleMonoNL-Variable": "sha256-zdMMVg+KS/VSP/ICQciSMOXLFZdcyZvJQusXcYJlfbs=",
-  "MapleMonoNL-Woff2": "sha256-ksaugxwIw56txNfOJtgSeSOffwUxs4JrIUYfDj5t3wY=",
-  "MapleMonoNormal-CN-unhinted": "sha256-B4v2lJeSerzX3NRbfalAQ2zfNQJtkwfO3fVvrL5yAWg=",
-  "MapleMonoNormal-CN": "sha256-MBtXNBDzW6WogNCvGMVzzgJ5VPupYOPPI/f8OC+qU0w=",
-  "MapleMonoNormal-NF-CN-unhinted": "sha256-a/rW5sU02nBMx0SuSfIZPnR37g9WzzBSv9J46kiv4xc=",
-  "MapleMonoNormal-NF-CN": "sha256-p1mFIMlT4JEmxyGCG24W8SCdi+4d1S9QyHF09g3iDnY=",
-  "MapleMonoNormal-NF-unhinted": "sha256-1sn7wt1s71t0F4W8fUSbqOie71V4cJisBrpFc77s0jI=",
-  "MapleMonoNormal-NF": "sha256-zoLY/fj7kxkg0040K0UQxhieicM5eo9WLS+WBAXZr5g=",
-  "MapleMonoNormal-OTF": "sha256-OdaYoRney4GwdsQvruR+jj889LBwBWU9FtTNJR9pIHo=",
-  "MapleMonoNormal-TTF-AutoHint": "sha256-bx7FdvgDPpQV8wGpWD+3wzEETSL3HgYnM8UbmoSJSc4=",
-  "MapleMonoNormal-TTF": "sha256-FULu8LaFW+RcUiO5HVj2e4vhfcphgvmyRT/iQ0/xQc8=",
-  "MapleMonoNormal-Variable": "sha256-jCkN4QghmVlyuFO1eeL9vS0TNNVFNp9uQ0i226SNTtg=",
-  "MapleMonoNormal-Woff2": "sha256-EApY/qeoRMOseqqWz52tySSQk+BUZ71iafE03DGfQ/Q=",
-  "MapleMonoNormalNL-CN-unhinted": "sha256-mkswI0WwTyg+RWKFeb2M/mkfIFc1PIgVy2QYjqQiuiA=",
-  "MapleMonoNormalNL-CN": "sha256-TrOyQkGibptTtXAT+269XvZsgWv39n1jO5yIn2NaZII=",
-  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-3ZMVAS/2coyy0cAy5e/r3XHKSTsfGxOn97jVQf7b/WY=",
-  "MapleMonoNormalNL-NF-CN": "sha256-Zqu+FfuJmtFglwm7kwUZ8tR8xMvd1kacepK1KkCD1WI=",
-  "MapleMonoNormalNL-NF-unhinted": "sha256-GW4jUZ05BUIxl164Uu4b2gsACP6MyfehrgQ8Ja57/HI=",
-  "MapleMonoNormalNL-NF": "sha256-+tApldIkG2s+IG7EOp/DqsRqcSXtu6H0SiuoO6H/E6I=",
-  "MapleMonoNormalNL-OTF": "sha256-lehO8olLXbwD/6TTuJw4z1V2ZQQaIU0yglL06a4foAg=",
-  "MapleMonoNormalNL-TTF-AutoHint": "sha256-+5OrKlftga0gWyTNZ5W79CqkdvZNfrM991RuWyMSq3k=",
-  "MapleMonoNormalNL-TTF": "sha256-ZfyCm62dfoLicwxUgvbgYBibvmhtIJTklK1zu7K6ies=",
-  "MapleMonoNormalNL-Variable": "sha256-oJdnpT3HuyptiD2P4Jm2Kj3ch8Pq/aoW5zfvtjZ1Lac=",
-  "MapleMonoNormalNL-Woff2": "sha256-ioeqrNud0v3/xgP7wmycxus7CcqsPDb8NMyYCCQih2k="
+  "MapleMono-CN-unhinted": "sha256-+OBpkxboDvvjP5Rh8xoFUH76a237nilG0Ko1Me/Ygw4=",
+  "MapleMono-CN": "sha256-PVmtJLV9tyojaM5CIbQ9M2gOQPhx4Tjvam4vVO1/UqM=",
+  "MapleMono-NF-CN-unhinted": "sha256-qT77eUeq9Uept1AJuz4KvbJlfqvUtooJSekVoJUphD0=",
+  "MapleMono-NF-CN": "sha256-w7j1UI8OE4CbNzeY4n0g3WKtVgkJ07uMpRnRCVRIo8M=",
+  "MapleMono-NF-unhinted": "sha256-g2XHcy1zqZ/M5Fw6JQD2ifWmNijWZzcvQ5LdsAQJQWA=",
+  "MapleMono-NF": "sha256-E6hYxVShsP+QrgM1w6hjCiiArvQfcIHAEvG7WGOcpds=",
+  "MapleMono-OTF": "sha256-LnNxiGLtqO2H01O25N36ML9Kwxop9fH+4IvXk1VJFvs=",
+  "MapleMono-TTF-AutoHint": "sha256-K3oj/ik/9dkpH7sp1EgX12Ts/zsTWFOOulGwE2k+eno=",
+  "MapleMono-TTF": "sha256-1wQ97Tm2BN+ba2Oxonyeovl5UlLooYrYfkrA85CQZmM=",
+  "MapleMono-Variable": "sha256-qvph60EzXkkgDN+rvx8qH3IPAH9s/IIl3W8lb6cSN50=",
+  "MapleMono-Woff2": "sha256-eUHj2NOjsVvwFnh2/chauGEGfBXe5f7xeN2DLm9j5ko=",
+  "MapleMonoNL-CN-unhinted": "sha256-gqgd25Zkp1g/A5d1NTkawb8pnFv7ITTwdK1JQMzie9w=",
+  "MapleMonoNL-CN": "sha256-fZTMr9SGtaUJJ7GwILQ0anNMsS6XLDFoYqbF12aD7N0=",
+  "MapleMonoNL-NF-CN-unhinted": "sha256-r1+8h0Tosdgum02mDXQQtoxwbyVD+WjtAkdPXT74Yd0=",
+  "MapleMonoNL-NF-CN": "sha256-RubqDmNtgtuzFFTD8p5EV1PIE4zUFtOqsbT84ed+oTc=",
+  "MapleMonoNL-NF-unhinted": "sha256-QLyTquz5Xfd/DZ9NEWqNmAcOzDyiXV4KzePLhzZKL60=",
+  "MapleMonoNL-NF": "sha256-zo/voGFI/8wTzeXj+STzOPK8xEV5Tnmpg0LYbeJ3vgI=",
+  "MapleMonoNL-OTF": "sha256-iK1XlhFlMy8UnjYbntOhvZtL3BlQmGDk5YIAxfaaUKA=",
+  "MapleMonoNL-TTF-AutoHint": "sha256-KZRI7INinrg3yHrIcfFo/Za36d569z2fXjKsGXBXmV8=",
+  "MapleMonoNL-TTF": "sha256-4G61jgVY2PcjS4RRB/tDKujZ7rDdG44o5OYSJKQbboE=",
+  "MapleMonoNL-Variable": "sha256-6lxd8bdREW7loOUznAQUIvjhs7p/LDsD6pJbk4JmNpU=",
+  "MapleMonoNL-Woff2": "sha256-Ovh6++Bz8Cib9BcHxg5SYm6NHgKHuX9MW6HbmPH/LJw=",
+  "MapleMonoNormal-CN-unhinted": "sha256-BRRISfA21EQvNUlCGwNiVBkZpDAF+iCV99LsYJsuv9Q=",
+  "MapleMonoNormal-CN": "sha256-SXG2nlBpyuiFMLUClyl5ZzoPxVF5w33JjCaC5tPG/8s=",
+  "MapleMonoNormal-NF-CN-unhinted": "sha256-0EZzl2Cddqh2tLsfDd5VNhJweueZJK/KaqO9VUkGLIk=",
+  "MapleMonoNormal-NF-CN": "sha256-/nQhsf7AyoJ+xkUujY8z5p/xWyPLROIGtpSQgMvmlYc=",
+  "MapleMonoNormal-NF-unhinted": "sha256-2LlrEYI92GHRICLfYbUl9U+EbdAbCjiZSXD7z5vRC4w=",
+  "MapleMonoNormal-NF": "sha256-UJAXFD4KVm8lbZzPMaEwrH0divRf7HxixDxurPGkU44=",
+  "MapleMonoNormal-OTF": "sha256-98NGP7arvw1W2akNWweKK+OfW14VtbF/fy8olRXcAPA=",
+  "MapleMonoNormal-TTF-AutoHint": "sha256-j9mG3VM4DP82ynw0UFuMDXjcbMnuVKOfJ9HMBFrrvDk=",
+  "MapleMonoNormal-TTF": "sha256-mEJJ/y5amhMBt+MroSUMuaTqGg3LUeYTiAn/vAMfy5U=",
+  "MapleMonoNormal-Variable": "sha256-LwW94IJAfdltG2wmJiv6JmB8fNdddb//yHsZvMvlSTo=",
+  "MapleMonoNormal-Woff2": "sha256-HuHcNeCw/AEsScKGciTK5O5Rz7eCS0hlzfz5ZYcqLyU=",
+  "MapleMonoNormalNL-CN-unhinted": "sha256-u7QqDoWt+NZgBxFH4D/U+SyiCKEObKPOh89A9fINoUk=",
+  "MapleMonoNormalNL-CN": "sha256-K30io0S/kqpLD3aBZcTvVKy5IGbzq43uiTzKmxEgpW8=",
+  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-RYQR301tnCD85t5f5E7wpTXrg6NDw3drJ85Z6z/Xo68=",
+  "MapleMonoNormalNL-NF-CN": "sha256-UDgWMxBzZajs0p6lBtAW2jbZEvMLb4GpvmdKhKWU+W4=",
+  "MapleMonoNormalNL-NF-unhinted": "sha256-vf7pXN7N+/HA1gia4mFGJNJOsrBdUf5lNKi/BlLoNN0=",
+  "MapleMonoNormalNL-NF": "sha256-VqKI6pICNlUZ/5cpgNRRKNgeA3xgUNYEVDjUDb006Ss=",
+  "MapleMonoNormalNL-OTF": "sha256-uQjt6K5s6+1sIxRnI51PgDxlyRi7xIsiNZbIP3hauNw=",
+  "MapleMonoNormalNL-TTF-AutoHint": "sha256-0zS5NdpnIeOwcaz8Rv1sCWeUdjWZE8SoF54myIQKAFE=",
+  "MapleMonoNormalNL-TTF": "sha256-Oqa2CPuXqqemxUR37Z98KOz2EWDXbxLSGZUpsQpMdGA=",
+  "MapleMonoNormalNL-Variable": "sha256-kWh6n9lFShmnLME0+1M2aKOrc64WrZk6SkQTT2AkEDU=",
+  "MapleMonoNormalNL-Woff2": "sha256-/Dl6B5Ya6BWHZqzOH7wcuJmTOUtO3jJXiW83+vWJpgM="
 }

From 344ee0cf075b1cf690b8cbf743de93c9ec2abaa5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Mar 2025 17:14:42 +0100
Subject: [PATCH 10/45] nixos/oci-containers: stricter dependencies for
 rootless containers with sdnotify=healthy

After running this configuration for a while, we
noticed that the containers didn't get back up once and the services
failed with the following error:

    Error: current system boot ID differs from cached boot ID; an unhandled reboot has occurred.

This is hard to reproduce and seems to be a timing issue. However,
the logs indicated another issue that this patch now solves:

* The ExecStartPost= indicated that the user session got stopped before
  which is required or sdnotify=healthy. Add explicit ordering for
  user@. This unfortunately requires a statically declared uid.
---
 .../modules/virtualisation/oci-containers.nix | 27 ++++++++++++++++---
 nixos/tests/oci-containers.nix                |  1 +
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index d81246e31383..851726ff4cf9 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -434,6 +434,7 @@ let
       };
 
       effectiveUser = container.podman.user or "root";
+      inherit (config.users.users.${effectiveUser}) uid;
       dependOnLingerService =
         cfg.backend == "podman" && effectiveUser != "root" && config.users.users.${effectiveUser}.linger;
     in
@@ -441,7 +442,7 @@ let
       wantedBy = [ ] ++ optional (container.autoStart) "multi-user.target";
       wants =
         lib.optional (container.imageFile == null && container.imageStream == null) "network-online.target"
-        ++ lib.optional dependOnLingerService "linger-users.service";
+        ++ lib.optionals dependOnLingerService [ "linger-users.service" ];
       after =
         lib.optionals (cfg.backend == "docker") [
           "docker.service"
@@ -452,8 +453,15 @@ let
           "network-online.target"
         ]
         ++ dependsOn
-        ++ lib.optional dependOnLingerService "linger-users.service";
-      requires = dependsOn;
+        ++ lib.optionals dependOnLingerService [ "linger-users.service" ]
+        ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [
+          "user@${toString uid}.service"
+        ];
+      requires =
+        dependsOn
+        ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [
+          "user@${toString uid}.service"
+        ];
       environment = lib.mkMerge [
         proxy_env
         (mkIf (cfg.backend == "podman" && container.podman.user != "root") {
@@ -523,6 +531,10 @@ let
         else
           "${cfg.backend} rm -f ${name} || true";
 
+      unitConfig = mkIf (effectiveUser != "root") {
+        RequiresMountsFor = "/run/user/${toString uid}/containers";
+      };
+
       serviceConfig =
         {
           ### There is no generalized way of supporting `reload` for docker
@@ -616,6 +628,15 @@ in
                   assertion = cfg.backend == "docker" -> podman == null;
                   message = "virtualisation.oci-containers.containers.${name}: Cannot set `podman` option if backend is `docker`.";
                 }
+                {
+                  assertion =
+                    cfg.backend == "podman" && podman.sdnotify == "healthy" && podman.user != "root"
+                    -> config.users.users.${podman.user}.uid != null;
+                  message = ''
+                    Rootless container ${name} (with podman and sdnotify=healthy)
+                    requires that its running user ${podman.user} has a statically specified uid.
+                  '';
+                }
               ];
           in
           concatMap (name: toAssertions name cfg.containers.${name}) (lib.attrNames cfg.containers);
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index 073f62cf5155..a22bd9c6b431 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -80,6 +80,7 @@ let
               home = "/var/lib/redis";
               linger = type == "healthy";
               createHome = true;
+              uid = 2342;
               subUidRanges = [
                 {
                   count = 65536;

From 546696cd15b03cc13028bc98e2b8481ff50f06ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 18:56:09 +0000
Subject: [PATCH 11/45] ts_query_ls: 1.11.0 -> 2.0.0

---
 pkgs/by-name/ts/ts_query_ls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index 2e38695c2976..3a1a4c03bd90 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   pname = "ts_query_ls";
-  version = "1.11.0";
+  version = "2.0.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage {
     owner = "ribru17";
     repo = "ts_query_ls";
     rev = "v${version}";
-    hash = "sha256-RpzQUqCaS6/MrYlVqkWaJPUgEpIBIzToMygn+TDeX88=";
+    hash = "sha256-RWryYFeJ6DdXG9kSjPbSu3xfiGjaUBNEj2XBIoXbySg=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-g0BVLduTWZRxNwDblvl7lm/ZduvEAbkSFYmzADMkKjg=";
+  cargoHash = "sha256-IlvUpEpdMocJ1d5GVWmuKfVRdOskuzIiqP6uSg/QxZc=";
 
   meta = {
     description = "LSP implementation for Tree-sitter's query files";

From 52a2b45959caf3ef9cbdb8d9b8358b0f77bd9906 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 12:19:27 +0800
Subject: [PATCH 12/45] httptap: 0.0.8 -> 0.1.1

Diff: https://github.com/monasticacademy/httptap/compare/refs/tags/v0.0.8...refs/tags/v0.1.1
---
 pkgs/by-name/ht/httptap/package.nix | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ht/httptap/package.nix b/pkgs/by-name/ht/httptap/package.nix
index 547ac3ce14d9..8d8f15cd4c3e 100644
--- a/pkgs/by-name/ht/httptap/package.nix
+++ b/pkgs/by-name/ht/httptap/package.nix
@@ -2,37 +2,24 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "httptap";
-  version = "0.0.8";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "monasticacademy";
     repo = "httptap";
-    tag = "v${version}";
-    hash = "sha256-1BtV5ao5dAKSINdUdJD/wxTMFXXiP8Vy1A7gQfVIsUQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Cn5u6q0r06SJp4uhF7j5K6yNZv8Q3WNxlDd5Vxmshhw=";
   };
 
-  patches = [
-    # this patch updates go.mod to include missing dependencies
-    # https://github.com/monasticacademy/httptap/pull/13
-    (fetchpatch {
-      name = "update-go-mod";
-      url = "https://github.com/monasticacademy/httptap/commit/3b520725c784d6435be6a51c58ae847bae729962.patch";
-      hash = "sha256-0dPq0Ldu1m8YZKctFtoUcbQdmx6sqjA8EVhTeMwNWx8=";
-    })
-  ];
-
-  vendorHash = "sha256-+TtHw2KdeNHCgnMnkxJJ9shqsrlbeTzYwbPH0dJmCjM=";
+  vendorHash = "sha256-yTtUt+kfDwN6W4caHCAYFjpYzhaqZUbLe+Nz7JKAXu8=";
 
   env.CGO_ENABLED = 0;
 
-  subPackages = [
-    "."
-  ];
+  subPackages = [ "." ];
 
   ldflags = [
     "-s"
@@ -46,4 +33,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ jpetrucciani ];
     mainProgram = "httptap";
   };
-}
+})

From 13a09f2d34c246df63a44bd5c1f6c34a5623fbd2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 13:11:44 +0800
Subject: [PATCH 13/45] mihomo-party: mark as insecure

---
 pkgs/by-name/mi/mihomo-party/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
index ecdc61aebd4b..bef256bd5022 100644
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ b/pkgs/by-name/mi/mihomo-party/package.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ ];
+    knownVulnerabilities = [ "https://github.com/mihomo-party-org/mihomo-party/issues/706" ];
   };
 }

From 039d22e5051721df71569253a0ff527ab7d11a11 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 15:02:09 +0800
Subject: [PATCH 14/45] icdiff: 1.9.5 -> 2.0.7

Diff: https://github.com/jeffkaufman/icdiff/compare/release-1.9.5...release-2.0.7
---
 pkgs/by-name/ic/icdiff/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ic/icdiff/package.nix b/pkgs/by-name/ic/icdiff/package.nix
index dff381e00e50..d34b976f068e 100644
--- a/pkgs/by-name/ic/icdiff/package.nix
+++ b/pkgs/by-name/ic/icdiff/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  fetchFromGitHub,
   python3Packages,
+  fetchFromGitHub,
   bash,
   git,
   less,
@@ -9,33 +9,33 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icdiff";
-  version = "1.9.5";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "jeffkaufman";
     repo = "icdiff";
-    rev = "release-${version}";
-    sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd";
+    tag = "release-${version}";
+    hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
   };
 
+  # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
+  doCheck = false;
+
   nativeCheckInputs = [
     bash
     git
     less
   ];
 
-  # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
-  doCheck = false;
-
   checkPhase = ''
     patchShebangs test.sh
     ./test.sh ${python3Packages.python.interpreter}
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.jefftk.com/icdiff";
     description = "Side-by-side highlighted command line diffs";
     maintainers = [ ];
-    license = licenses.psfl;
+    license = lib.licenses.psfl;
   };
 }

From 189dd476d41f5677e4538526577e72a76a2701c3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 27 Apr 2025 16:30:16 +0200
Subject: [PATCH 15/45] labels: add backport label for automatic browser
 updates

Browser updates should always be backported for security reasons, so
let's make our life a bit easier by adding the backport label for
r-ryantm's PRs automatically.
---
 .github/labeler-no-sync.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index a64a5d3cf730..34f87b91e179 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -7,6 +7,39 @@
       - any-glob-to-any-file:
         - .github/workflows/*
         - ci/**/*.*
+  - all:
+    - head-branch:
+      # r-ryantm's branches have this prefix.
+      - ^auto-update/
+    - changed-files:
+      - any-glob-to-any-file:
+        # Browser updates should always be backported.
+        - pkgs/applications/kde/angelfish.nix
+        - pkgs/applications/kde/falkon.nix
+        - pkgs/applications/kde/konqueror.nix
+        - pkgs/applications/networking/browsers/**/*
+        - pkgs/by-name/br/brave/**/*
+        # Added in December 2024, uncomment for 25.05
+        # - pkgs/by-name/ca/catalyst-browser/**/*
+        - pkgs/by-name/ch/chawan/**/*
+        - pkgs/by-name/di/dillo-plus/**/*
+        - pkgs/by-name/di/dillo/**/*
+        - pkgs/by-name/ed/edbrowse/**/*
+        - pkgs/by-name/ep/epiphany/**/*
+        - pkgs/by-name/go/google-chrome/**/*
+        - pkgs/by-name/ly/lynx/**/*
+        - pkgs/by-name/mi/microsoft-edge/**/*
+        - pkgs/by-name/mi/midori-unwrapped/**/*
+        - pkgs/by-name/mu/mullvad-browser/**/*
+        - pkgs/by-name/op/opera/**/*
+        - pkgs/by-name/to/tor-browser/**/*
+        - pkgs/by-name/vi/vimb-unwrapped/**/*
+        - pkgs/by-name/w3/w3m/**/*
+        - pkgs/desktops/lomiri/applications/morph-browser/**/*
+        - pkgs/development/libraries/webkitgtk/**/*
+        - pkgs/kde/gear/angelfish/**/*
+        - pkgs/kde/gear/falkon/**/*
+        - pkgs/kde/gear/konqueror/**/*
 
 "6.topic: policy discussion":
   - any:

From 5a115157886eee0d73a39e361f1ef0478aeedafe Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 May 2025 18:22:14 +0800
Subject: [PATCH 16/45] =?UTF-8?q?libgedit-gfls:=200.2.1=20=E2=86=92=200.3.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/libgedit-gfls/-/compare/0.2.1...0.3.0
---
 pkgs/by-name/li/libgedit-gfls/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix
index e1572fed66a0..4177af865e1d 100644
--- a/pkgs/by-name/li/libgedit-gfls/package.nix
+++ b/pkgs/by-name/li/libgedit-gfls/package.nix
@@ -11,11 +11,12 @@
   mesonEmulatorHook,
   gtk3,
   glib,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgedit-gfls";
-  version = "0.2.1";
+  version = "0.3.0";
 
   outputs = [
     "out"
@@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     group = "World";
     owner = "gedit";
     repo = "libgedit-gfls";
-    rev = finalAttrs.version;
-    hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg=";
+    tag = finalAttrs.version;
+    hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w=";
   };
 
   nativeBuildInputs =
@@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls";
     description = "Module dedicated to file loading and saving";

From cbed0989340a30e2913ff5e6e5fa6acae6c122de Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 May 2025 18:31:39 +0800
Subject: [PATCH 17/45] =?UTF-8?q?libgedit-tepl:=206.12.0=20=E2=86=92=206.1?=
 =?UTF-8?q?3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/libgedit-tepl/-/compare/6.12.0...6.13.0
---
 pkgs/by-name/li/libgedit-tepl/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix
index 6c48604b3691..0f81c4e9e414 100644
--- a/pkgs/by-name/li/libgedit-tepl/package.nix
+++ b/pkgs/by-name/li/libgedit-tepl/package.nix
@@ -15,11 +15,12 @@
   pkg-config,
   gtk-doc,
   docbook-xsl-nons,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libgedit-tepl";
-  version = "6.12.0";
+  version = "6.13.0";
 
   outputs = [
     "out"
@@ -32,8 +33,8 @@ stdenv.mkDerivation rec {
     group = "World";
     owner = "gedit";
     repo = "libgedit-tepl";
-    rev = version;
-    hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE=";
+    tag = version;
+    hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM=";
   };
 
   strictDeps = true;
@@ -62,6 +63,8 @@ stdenv.mkDerivation rec {
     libgedit-gtksourceview
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
     description = "Text editor product line";

From 7ba7cf0afc1e326bbb3bf795a843bf03164720a4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 May 2025 18:18:40 +0800
Subject: [PATCH 18/45] =?UTF-8?q?gedit:=2048.1=20=E2=86=92=2048.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/gedit/-/compare/48.1...48.2
---
 pkgs/by-name/ge/gedit/package.nix | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix
index 0a18a3c39c04..d76cfd91456a 100644
--- a/pkgs/by-name/ge/gedit/package.nix
+++ b/pkgs/by-name/ge/gedit/package.nix
@@ -3,8 +3,7 @@
   lib,
   meson,
   mesonEmulatorHook,
-  fetchurl,
-  python3,
+  fetchFromGitLab,
   pkg-config,
   gtk3,
   gtk-mac-integration,
@@ -20,7 +19,7 @@
   gobject-introspection,
   docbook-xsl-nons,
   ninja,
-  gnome,
+  gitUpdater,
   gspell,
   itstool,
   desktop-file-utils,
@@ -29,16 +28,21 @@
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "48.1";
+  version = "48.2";
 
   outputs = [
     "out"
     "devdoc"
   ];
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
-    hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "gedit";
+    repo = "gedit";
+    tag = version;
+    fetchSubmodules = true;
+    hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY=";
   };
 
   patches = [
@@ -55,7 +59,6 @@ stdenv.mkDerivation rec {
       meson
       ninja
       pkg-config
-      python3
       vala
       wrapGAppsHook3
       gtk-doc
@@ -81,19 +84,10 @@ stdenv.mkDerivation rec {
       gtk-mac-integration
     ];
 
-  postPatch = ''
-    chmod +x build-aux/meson/post_install.py
-    patchShebangs build-aux/meson/post_install.py
-  '';
-
   # Reliably fails to generate gedit-file-browser-enum-types.h in time
   enableParallelBuilding = false;
 
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gedit";
-    };
-  };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/gedit/gedit";

From e722f9f8e6010bc4b7d21e36032daeecc5cc7068 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 May 2025 18:28:30 +0800
Subject: [PATCH 19/45] =?UTF-8?q?enter-tex:=203.47.0=20=E2=86=92=203.48.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/gedit/enter-tex/-/compare/3.47.0...3.48.0
---
 pkgs/by-name/en/enter-tex/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix
index f0ee8ce9f387..ba5874c66536 100644
--- a/pkgs/by-name/en/enter-tex/package.nix
+++ b/pkgs/by-name/en/enter-tex/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchFromGitLab,
   desktop-file-utils,
   docbook-xsl-nons,
   gettext,
@@ -21,16 +21,20 @@
   libgedit-gtksourceview,
   libgedit-tepl,
   libgee,
-  gnome,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "enter-tex";
-  version = "3.47.0";
+  version = "3.48.0";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "gedit";
+    repo = "enter-tex";
+    tag = finalAttrs.version;
+    hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno=";
   };
 
   nativeBuildInputs = [
@@ -60,18 +64,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   preBuild = ''
     # Workaround the use case of C code mixed with Vala code.
-    # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure
+    # https://gitlab.gnome.org/World/gedit/enter-tex/-/blob/3.48.0/docs/more-information.md#install-procedure
     ninja src/gtex/Gtex-1.gir
   '';
 
   doCheck = true;
 
-  passthru.updateScript = gnome.updateScript {
-    packageName = "enter-tex";
-  };
+  passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    homepage = "https://gitlab.gnome.org/swilmet/enter-tex";
+    homepage = "https://gitlab.gnome.org/World/gedit/enter-tex";
     description = "LaTeX editor for the GNOME desktop";
     maintainers = with maintainers; [
       manveru

From d1fed8f0ca39746bd60f9800e4863d0c08ffa0b1 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 1 May 2025 19:11:36 +0300
Subject: [PATCH 20/45] nixos/doc/rl2505: fix typos

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 58bef8539acf..5fa3f348ccf8 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -112,7 +112,7 @@
 
 - [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable).
 
-- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilites on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable).
+- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable).
 
 - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer).
 
@@ -182,7 +182,7 @@
 
 - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).
 
-- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Availble as [services.lavalink](#opt-services.lavalink.enable).
+- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Available as [services.lavalink](#opt-services.lavalink.enable).
 
 - [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable).
 
@@ -397,7 +397,7 @@
   +extraCreateArgs+=("--exclude" "/some/path")
   ```
 
-- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details.
+- `programs.xonsh.package` now gets overridden internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details.
 
 - `services.nitter.guestAccounts` has been renamed to `services.nitter.sessionsFile`, for consistency with upstream. The file format is unchanged.
 

From 0c94d6d4c5c2ec9994e4f78733259b6ecacd4874 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 1 May 2025 19:16:17 +0300
Subject: [PATCH 21/45] doc/rl2505: fix typos

---
 doc/release-notes/rl-2505.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 1f674ee460b6..19cb9f59e4c8 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -338,7 +338,7 @@
   [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6)
   for more information.
 
-- `depdendency-track` no longer bundes the UI inside the jar. This bundling
+- `dependency-track` no longer bundes the UI inside the jar. This bundling
   functionality is deprecated by upstream and causes UI assets not being served
   after weeks of runtime.
 

From 29cfe5bd679c0c49d52a2bec41798b0bd87bd1f8 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 1 May 2025 19:20:00 +0300
Subject: [PATCH 22/45] nixos/doc: fix typos in LUKS section

---
 nixos/doc/manual/configuration/luks-file-systems.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixos/doc/manual/configuration/luks-file-systems.section.md
index b20957b40b89..a1d22f34e920 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.section.md
+++ b/nixos/doc/manual/configuration/luks-file-systems.section.md
@@ -117,7 +117,7 @@ added to the LUKS volume.
 ```
 
 Existing key slots are left intact, unless `--wipe-slot=` is specified. It is
-recommened to add a recovery key that should be stored in a secure physical
+recommended to add a recovery key that should be stored in a secure physical
 location and can be entered wherever a password would be entered.
 
 ```ShellSession

From ce5cf79e21853b8bb46ae21b5efec731a8a49624 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 1 May 2025 19:20:22 +0300
Subject: [PATCH 23/45] nixos/doc: fix typos in settings-options section

---
 nixos/doc/manual/development/settings-options.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index 4b49a1e82090..736662ad7ed9 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -412,7 +412,7 @@ have a predefined type and string generator already declared under
 
     `multiline` (default `true`)
 
-    :   Whether to procude a multiline output. The output may still wrap across
+    :   Whether to produce a multiline output. The output may still wrap across
         multiple lines if it would otherwise exceed `columnWidth`.
 
     `columnWidth` (default `100`)

From d4cda46d75aa3b1765a72a8567ad823b704ca458 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Thu, 1 May 2025 19:24:08 +0300
Subject: [PATCH 24/45] nixos/borgbackup: fix typo in example passphrase

---
 nixos/modules/services/backup/borgbackup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md
index 8ae869308bb8..23f0e5c934ed 100644
--- a/nixos/modules/services/backup/borgbackup.md
+++ b/nixos/modules/services/backup/borgbackup.md
@@ -105,7 +105,7 @@ The following few commands (run as root) let you test your backup.
 > systemctl restart borgbackup-job-backupToLocalServer
 > sleep 10
 > systemctl restart borgbackup-job-backupToLocalServer
-> export BORG_PASSPHRASE=topSecrect
+> export BORG_PASSPHRASE=topSecret
 > borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:.
 nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac]
 nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68]

From 34bebff5b9f08460a03efd7f8d2da4c30244ed12 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 31 Mar 2025 14:00:00 +0200
Subject: [PATCH 25/45] chickenPackages.chickenEggs: update

---
 .../development/compilers/chicken/5/deps.toml | 115 +++++++++++++-----
 1 file changed, 82 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml
index 541a8bbbd025..85c22bbfe817 100644
--- a/pkgs/development/compilers/chicken/5/deps.toml
+++ b/pkgs/development/compilers/chicken/5/deps.toml
@@ -44,9 +44,9 @@ version = "1.2"
 [address-info]
 dependencies = ["srfi-1"]
 license = "bsd"
-sha256 = "0vzrbzalqx3bv5nzq9rykfyhnrgnf2hlh55hi67pgync9z06v3jy"
+sha256 = "1drshasifvvpzp3bk7gc3pbvawcajhmhp9pg25dynbd0yndvgnby"
 synopsis = "Network address information access"
-version = "1.0.5"
+version = "1.0.6"
 
 [advice]
 dependencies = ["srfi-1"]
@@ -359,23 +359,23 @@ version = "1.2"
 [breadline]
 dependencies = ["apropos", "srfi-18"]
 license = "gpl-3"
-sha256 = "1kkga2n6vw2hxg9sd20f6swnj6hikddyiamsdbqp5m72nlxkq72c"
+sha256 = "1rvffygravnaw5sns03qfn28zznvamprfhmzgscjfpck1j4x6ylc"
 synopsis = "Bindings to readline"
-version = "0.12"
+version = "1.0.2"
 
 [brev-separate]
 dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"]
 license = "bsd-1-clause"
-sha256 = "1wzcqbccngcajzw4js7llys1pnmnvsmkk01v1ji6khy4kyghvspl"
+sha256 = "08mczqjyaf5bhm64hnb80r0237mq9w2kj4grn2a8ahzc7870h7jm"
 synopsis = "Hodge podge of macros and combinators"
-version = "1.97"
+version = "1.98"
 
 [brev]
 dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"]
 license = "public-domain"
-sha256 = "0gzbhyv228a76cnnisn7cqyhjsrphxn0bavxisg9rd40ndggijka"
+sha256 = "0k890r62hp5ivyah3mrwm712xxlkrb7qmzg1825nmw1ij8c2hj1z"
 synopsis = "A huge pile of batteries and shortcuts"
-version = "1.42"
+version = "1.43"
 
 [byte-blob]
 dependencies = ["srfi-1"]
@@ -546,11 +546,11 @@ synopsis = "A chicken wrapper for cmark with markdown to sxml capabilities"
 version = "0.1.0"
 
 [coin-change]
-dependencies = ["srfi-1"]
+dependencies = []
 license = "unlicense"
-sha256 = "09p83afsh2dx4y2cpyi55bf2br03ysdpq9xrqik7fmks3913kxmk"
+sha256 = "0pjrf705ri2cxqnvc3648ww71zgn163r4g7a3wf5zwnhsha2fmya"
 synopsis = "Greedy solver for the coin change problem"
-version = "1.0.2"
+version = "1.0.4"
 
 [color]
 dependencies = ["fmt", "records", "srfi-13"]
@@ -723,9 +723,9 @@ version = "1.2"
 [define-options]
 dependencies = ["brev-separate", "getopt-long", "matchable", "quasiwalk", "srfi-1"]
 license = "lgpl"
-sha256 = "1j9lj5kj3j8jhclxnxrrc2wn6qn9j0bhr2y9fydg05an9q7jmrh0"
+sha256 = "1cnd1gfbsnbkgj7nlcps74clsslfcbf5addji1b4v63zn3v167va"
 synopsis = "Conveniently bind to getopt-long options"
-version = "1.23"
+version = "1.24"
 
 [define-record-and-printer]
 dependencies = ["hahn", "matchable"]
@@ -1423,9 +1423,9 @@ version = "0.4"
 [ipfs]
 dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"]
 license = "unlicense"
-sha256 = "1fipsadibalrakzgai8mhxhizsy5a9jdg82x7x4r84gzjr30s327"
+sha256 = "0fip6rkpg14xbjg2nk191ib3n4lckn8ynpnvlmb7jwk356b499kz"
 synopsis = "IPFS HTTP API for Scheme"
-version = "0.0.17"
+version = "0.0.18"
 
 [irc]
 dependencies = ["matchable", "regex", "srfi-1"]
@@ -1626,9 +1626,9 @@ version = "3.4"
 [lmdb]
 dependencies = ["srfi-1"]
 license = "openldap"
-sha256 = "1ymy7ji9q7zvy8708f4zzavxkvajmq8l8m1z6v6873qkxgv6jkw8"
+sha256 = "0yr55f5sqj5ln8h0wd7ra8qrs5rv0rppqhg2px4azx1jn3mmgdl0"
 synopsis = "Bindings to LMDB"
-version = "1.0.6"
+version = "1.0.7"
 
 [locale]
 dependencies = ["srfi-1", "utf8", "check-errors"]
@@ -1763,6 +1763,13 @@ sha256 = "11q9599lqs3rb0af6sxj2lvbm06a39igpnpdp1drl8zswdw41kyk"
 synopsis = "A flonum matrix module for CHICKEN Scheme."
 version = "0.6rel"
 
+[md2]
+dependencies = ["message-digest"]
+license = "bsd"
+sha256 = "1dcqr5dh4blrd7dphhjgywdxc93f513pyhw5c086kfcs1aiw7dpb"
+synopsis = "Message Digest 2 algorithm as defined in RFC1319"
+version = "1.3"
+
 [md5]
 dependencies = ["message-digest-primitive"]
 license = "public-domain"
@@ -2004,9 +2011,9 @@ version = "5.1.0"
 [number-limits]
 dependencies = []
 license = "bsd"
-sha256 = "134958zarw74yrxn97sixmm987b047p7izppc0cxx9rlviq145hd"
+sha256 = "1xw11mnvcwqqnjhljbpsn7966w3kqaygr3dcqqv6fkfxgccb811z"
 synopsis = "Limit constants for numbers"
-version = "3.0.8"
+version = "3.0.9"
 
 [oauth]
 dependencies = ["srfi-1", "srfi-13", "uri-common", "intarweb", "http-client", "hmac", "sha1", "base64"]
@@ -2099,6 +2106,13 @@ sha256 = "1dywjbim23k12fcvdiypq2g5p8wyljgq7zmsvlf8h2anaaq34sm1"
 synopsis = ""
 version = "0.3"
 
+[pbkdf2]
+dependencies = ["message-digest", "hmac", "sha2", "sha1", "md5", "md2"]
+license = "bsd"
+sha256 = "031yfdg33ypiyvqcd58paxfrmxy5j0nksjy7c2hgxrmz4q3dsb48"
+synopsis = "Password-Based Key Derivation Function as defined in RFC2898"
+version = "1.3"
+
 [pdf]
 dependencies = ["srfi-1", "regex", "format"]
 license = "bsd"
@@ -2550,9 +2564,9 @@ version = "1.8"
 [scm2wiki]
 dependencies = ["srfi-1", "srfi-13", "srfi-14", "args", "comparse"]
 license = "mit"
-sha256 = "03mc88pri6c3h5r5z3xz771mdarc0a6iv4x691jlq6chs983x13v"
+sha256 = "0q3w1i5ikn1hla4vy8g1374yh5ym9dh0fwm4pip8ffpdlhsbm571"
 synopsis = "An auto-documentation tool for CHICKEN Scheme."
-version = "0.3.3"
+version = "0.6.0"
 
 [scmfmt]
 dependencies = []
@@ -3194,9 +3208,9 @@ version = "0.1.7"
 [srfi-180]
 dependencies = ["srfi-34", "srfi-35", "srfi-158"]
 license = "bsd"
-sha256 = "1sxyhd4kzhlg0p3a1fzrxkqn7amhd8vb89ql4ykssrknmc9svmvd"
+sha256 = "14y763q74hrk9lgb21bdymcjinfd9bvf2q4kqm7vzay7ayghhc3x"
 synopsis = "A JSON parser and printer that supports JSON bigger than memory."
-version = "1.5.2"
+version = "1.6.1"
 
 [srfi-189]
 dependencies = ["srfi-1", "typed-records"]
@@ -3219,6 +3233,13 @@ sha256 = "18raq9r8nvs6dvb9fq7095bi9sxh655pjs4k7jwj486369jn90di"
 synopsis = "SRFI 193: Command line"
 version = "0.1.3"
 
+[srfi-194]
+dependencies = ["r7rs", "srfi-133", "srfi-27", "srfi-158"]
+license = "mit"
+sha256 = "1h5zyiqxh0zflh622fp151i88xglz12kzrvsakdrcljga3k1s6ww"
+synopsis = "Random data generators"
+version = "1.0.0"
+
 [srfi-196]
 dependencies = ["srfi-1", "srfi-133", "typed-records", "utf8"]
 license = "mit"
@@ -3282,6 +3303,13 @@ sha256 = "0vrpgqdmwdaphy0szskxyl2x6xhwycgvi6flwi5v6m2zi5cd3j1c"
 synopsis = "SRFI 227: Optional Arguments"
 version = "1.1"
 
+[srfi-228]
+dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-151"]
+license = "mit"
+sha256 = "1psh5ha8r7ryp26pkbv8yvvpy8x6lf5l7607npbjac0k8vr2jwrn"
+synopsis = "Composing Comparators"
+version = "1.0.0"
+
 [srfi-232]
 dependencies = ["srfi-1"]
 license = "mit"
@@ -3296,6 +3324,13 @@ sha256 = "0vf6f0f6jm4frpz995kxjzydg3p7vjn58shmv6s2p34hmfsjcm04"
 synopsis = "Multidimensional arrays"
 version = "1.3"
 
+[srfi-252]
+dependencies = ["r7rs", "srfi-1", "srfi-64", "srfi-158", "srfi-194", "srfi-143", "srfi-144"]
+license = "mit"
+sha256 = "0r1kxw29yjz941mbgmkgj66w7l8zh09mm69gqnhsl6h1hqb2wkbg"
+synopsis = "Property Testing"
+version = "1.0.0"
+
 [srfi-253]
 dependencies = ["r7rs"]
 license = "mit"
@@ -3303,6 +3338,13 @@ sha256 = "1b7lrsv5fhl9s3swz0abfx3y2wqrk07n3fwhymg9cz3908cjqms3"
 synopsis = "SRFI 253: Data (Type-)Checking"
 version = "0.1.0"
 
+[srfi-259]
+dependencies = ["r7rs", "integer-map"]
+license = "mit"
+sha256 = "1zlblib4k0gz40yazx2nxacspgkgcngsfk1lb5rv8kd0d3l8ckfk"
+synopsis = "Tagged procedures with type safety"
+version = "0.10.0"
+
 [srfi-27]
 dependencies = ["srfi-1", "vector-lib", "timed-resource", "miscmacros", "check-errors"]
 license = "bsd"
@@ -3579,9 +3621,9 @@ version = "1.39"
 [stty]
 dependencies = ["foreigners", "srfi-69"]
 license = "bsd"
-sha256 = "195qkj1ckji115ih9ccfsn52hg8cbbwn19vblcggv3g0xmpncdak"
+sha256 = "0pdry1874iswsm1bq1q38xv2ijf6hq9pwxisapgifjw0wgcld3i0"
 synopsis = "stty-style interface to termios"
-version = "0.6"
+version = "0.7"
 
 [sundials]
 dependencies = ["srfi-1", "srfi-69", "srfi-13", "compile-file"]
@@ -3593,9 +3635,9 @@ version = "2.17"
 [svgpath]
 dependencies = ["brev-separate", "clojurian", "match-generics", "miscmacros", "srfi-1", "srfi-69", "strse", "sxpath", "tree"]
 license = "lgpl"
-sha256 = "0017w5vc9qpz5gcghhlsw6fzla2vxkvykm9rvriiqm9zywq48wlh"
+sha256 = "1sp8v2cvlpjm3kjgaw5g73fszx71drzjcxrfbd38kg30xnd32jn3"
 synopsis = "Parse, normalize, and write SVG path data"
-version = "1.7"
+version = "1.15"
 
 [svn-client]
 dependencies = []
@@ -3649,9 +3691,9 @@ version = "1.0"
 [symbol-utils]
 dependencies = ["utf8"]
 license = "bsd"
-sha256 = "0sw95b9487i9sr27zxnl3f6f07wrrpzx3g75q32yk2v79q898kd8"
+sha256 = "1234p97sagl4bn1rgkrvp7xn22m6qrisnnpabmf51a6zn6ffj286"
 synopsis = "Symbol Utilities"
-version = "2.6.1"
+version = "2.6.2"
 
 [synch]
 dependencies = ["srfi-18", "check-errors"]
@@ -3726,9 +3768,9 @@ version = "0.0.6"
 [test-new-egg]
 dependencies = ["henrietta-cache", "salmonella", "srfi-1"]
 license = "bsd"
-sha256 = "01m7bi646f0ypv5j1zpsw16fk4rzw3lmycxlhkzzb11ghlgl2vqq"
+sha256 = "1ghcwf3i598bznkdxx3xprsfwkbqbyvf3l077z9jh2x1jdsvgfas"
 synopsis = "A tool to test new eggs before they are added to the official CHICKEN repository"
-version = "1.0.4"
+version = "1.0.5"
 
 [test-utils]
 dependencies = ["test"]
@@ -3810,9 +3852,9 @@ version = "2.0"
 [transducers]
 dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "srfi-253"]
 license = "mit"
-sha256 = "1ncbx703w0iwpsh2d302zlw6brajjdjravcp7y4cf3zk6rd3xfrd"
+sha256 = "0fyypwr9syd3iwhwayglff2rg6xsc4w3hcaz4k6ldm2y2f16g7yv"
 synopsis = "Transducers for working with foldable data types."
-version = "0.7.0"
+version = "0.7.1"
 
 [transmission]
 dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"]
@@ -4017,6 +4059,13 @@ sha256 = "1fj8swh4s4gwif2dp59ls0vbdi2d5w50b2q2q00yiyvlr7smm4hs"
 synopsis = "named standard colors as available in X11"
 version = "1.1"
 
+[xdg-basedir]
+dependencies = []
+license = "bsd"
+sha256 = "0ck91mxsyyrsdmxx3gi6p0dg1i9y5z9g77kvh6y0x20d0s3ymv0w"
+synopsis = "Implementation of the XDG Base Directory Specification"
+version = "1.0.0"
+
 [xj]
 dependencies = ["fmt", "html-parser", "srfi-1", "utf8", "brev-separate"]
 license = "bsd-3-clause"

From 6d97b80f9b3734a8f8457d63c83fecc7404e8ac7 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 1 May 2025 17:41:48 -0400
Subject: [PATCH 26/45] zfs_{2_3,unstable}: 2.3.1 -> 2.3.2

Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.1...zfs-2.3.2

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.2
---
 pkgs/os-specific/linux/zfs/2_3.nix      | 6 +++---
 pkgs/os-specific/linux/zfs/unstable.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix
index a3d90d68aff7..992cba2a68b0 100644
--- a/pkgs/os-specific/linux/zfs/2_3.nix
+++ b/pkgs/os-specific/linux/zfs/2_3.nix
@@ -15,10 +15,10 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_2_3";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.14";
+  kernelCompatible = kernel: kernel.kernelOlder "6.15";
 
   # this package should point to the latest release.
-  version = "2.3.1";
+  version = "2.3.2";
 
   tests = {
     inherit (nixosTests.zfs) installer series_2_3;
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
     amarshall
   ];
 
-  hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ=";
+  hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
 }
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 5da05d3513ca..b2ebfccc1410 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -14,20 +14,20 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_unstable";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.14";
+  kernelCompatible = kernel: kernel.kernelOlder "6.15";
 
   # this package should point to a version / git revision compatible with the latest kernel release
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.3.1";
+  version = "2.3.2";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ=";
+  hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

From 73617df82624083a48cefe513e2e803ac5e484c8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 2 May 2025 08:00:37 +0800
Subject: [PATCH 27/45] jetbrains-toolbox: fix tray icon

---
 pkgs/by-name/je/jetbrains-toolbox/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index d52400feecd1..6a5c0eacbedf 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -6,6 +6,7 @@
   fetchurl,
   makeWrapper,
   icu,
+  libappindicator-gtk3,
   undmg,
 }:
 
@@ -65,6 +66,7 @@ let
       install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop
       install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
       wrapProgram $out/bin/jetbrains-toolbox \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator-gtk3 ]} \
         --append-flags "--update-failed"
     '';
 

From 516252b4248eb436a30e21ede941da2b0d9c19af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 01:17:04 +0000
Subject: [PATCH 28/45] vuetorrent: 2.24.1 -> 2.24.2

---
 pkgs/by-name/vu/vuetorrent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix
index 53020fc2bb16..46664f0d26c5 100644
--- a/pkgs/by-name/vu/vuetorrent/package.nix
+++ b/pkgs/by-name/vu/vuetorrent/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "vuetorrent";
-  version = "2.24.1";
+  version = "2.24.2";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-FuX1wZVWB6+5G0ePE7Eb4Gkq736UKB/caW5AcCYJtUU=";
+    hash = "sha256-+BTnFQxg+8vJdfwER6lM7dszRxBiX20K/vYv+nuH/1Y=";
   };
 
-  npmDepsHash = "sha256-lRTB4Wfkp9UAi0N9iOSJQIJNFBz3RDGTglFofWqIWZ0=";
+  npmDepsHash = "sha256-4lIxaNqXO5jDmXgPfoxRuSe8p6jV7momSbpl9Nns0VI=";
 
   installPhase = ''
     runHook preInstall

From 50c4e9b2e0957b7a0e5afe389e416bce042b5871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:43:01 +0200
Subject: [PATCH 29/45] unblob: 25.1.8 -> 25.4.14

This version merges the native extension from `unblob-native`, so the
latter is deleted.
---
 pkgs/by-name/un/unblob/package.nix            | 31 ++++++++-----
 .../python-modules/unblob-native/default.nix  | 46 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 20 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/python-modules/unblob-native/default.nix

diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix
index fd682ee27366..47a22f5b1761 100644
--- a/pkgs/by-name/un/unblob/package.nix
+++ b/pkgs/by-name/un/unblob/package.nix
@@ -1,10 +1,14 @@
 {
   lib,
+  libiconv,
   python3,
   fetchFromGitHub,
   gitUpdater,
   makeWrapper,
+  rustPlatform,
+  stdenvNoCC,
   e2fsprogs,
+  erofs-utils,
   jefferson,
   lz4,
   lziprecover,
@@ -23,6 +27,7 @@ let
   # These dependencies are only added to PATH
   runtimeDeps = [
     e2fsprogs
+    erofs-utils
     jefferson
     lziprecover
     lzop
@@ -38,7 +43,7 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "unblob";
-  version = "25.1.8";
+  version = "25.4.14";
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.9";
 
@@ -46,15 +51,22 @@ python3.pkgs.buildPythonApplication rec {
     owner = "onekey-sec";
     repo = "unblob";
     tag = version;
-    hash = "sha256-PGpJPAo9q52gQ3EGusYtDA2e0MG5kFClqCYPB2DvuMs=";
+    hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90=";
     forceFetchGit = true;
     fetchLFS = true;
   };
 
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs=";
+  };
+
   strictDeps = true;
 
   build-system = with python3.pkgs; [ poetry-core ];
 
+  buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ];
+
   dependencies = with python3.pkgs; [
     arpy
     attrs
@@ -69,15 +81,17 @@ python3.pkgs.buildPythonApplication rec {
     pyfatfs
     pyperscan
     python-magic
+    pyzstd
     rarfile
     rich
     structlog
     treelib
-    unblob-native
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with rustPlatform; [
     makeWrapper
+    maturinBuildHook
+    cargoSetupHook
   ];
 
   # These are runtime-only CLI dependencies, which are used through
@@ -87,7 +101,7 @@ python3.pkgs.buildPythonApplication rec {
     "ubi-reader"
   ];
 
-  pythonRelaxDeps = [ "rich" ];
+  pythonRelaxDeps = [ "lz4" ];
 
   pythonImportsCheck = [ "unblob" ];
 
@@ -112,13 +126,6 @@ python3.pkgs.buildPythonApplication rec {
       disabled = [
         # https://github.com/tytso/e2fsprogs/issues/152
         "test_all_handlers[filesystem.extfs]"
-
-        # Should be dropped after upgrading to next version
-        # Needs https://github.com/onekey-sec/unblob/pull/1128/commits/c6af67f0c6f32fa01d7abbf495eb0293e9184438
-        # Unfortunately patches touching LFS stored assets cannot be applied
-        "test_all_handlers[filesystem.ubi.ubi]"
-        "test_all_handlers[archive.dlink.encrpted_img]"
-        "test_all_handlers[archive.dlink.shrs]"
       ];
     in
     [
diff --git a/pkgs/development/python-modules/unblob-native/default.nix b/pkgs/development/python-modules/unblob-native/default.nix
deleted file mode 100644
index ac1f7035ac31..000000000000
--- a/pkgs/development/python-modules/unblob-native/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  buildPythonPackage,
-  fetchFromGitHub,
-  nix-update-script,
-  rustPlatform,
-  libiconv,
-}:
-
-buildPythonPackage rec {
-  pname = "unblob-native";
-  version = "0.1.6";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "onekey-sec";
-    repo = "unblob-native";
-    tag = "v${version}";
-    hash = "sha256-11eMU7eplvZS1OS34fhbD8g1dOwOUCc8Xk1dEZI8dyU=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-NjyxAZH4A46llIjEQO0X+IiwpS74RPY9wLujsDr7OxA=";
-  };
-
-  nativeBuildInputs = with rustPlatform; [
-    maturinBuildHook
-    cargoSetupHook
-  ];
-
-  buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ];
-
-  pythonImportsCheck = [ "unblob_native" ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Performance sensitive parts of Unblob";
-    homepage = "https://unblob.org";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ vlaci ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index ba96df2c36e6..4d1a941a6b64 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -772,6 +772,7 @@ mapAliases ({
   types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
   ufoLib2 = ufolib2; # added 2024-01-07
   ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
+  unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
   unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
   update_checker = update-checker; # added 2024-01-07
   uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 464cfed57f71..3b8d08e16e47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18367,8 +18367,6 @@ self: super: with self; {
 
   unasync = callPackage ../development/python-modules/unasync { };
 
-  unblob-native = callPackage ../development/python-modules/unblob-native { };
-
   uncertainties = callPackage ../development/python-modules/uncertainties { };
 
   uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };

From 4cd11fd5230261497d946a32c9f04af6b6d824e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 07:15:42 +0000
Subject: [PATCH 30/45] lug-helper: 3.7 -> 3.8

---
 pkgs/by-name/lu/lug-helper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix
index 5e0e8dc152b4..047410317329 100644
--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@@ -15,12 +15,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   name = "lug-helper";
-  version = "3.7";
+  version = "3.8";
   src = fetchFromGitHub {
     owner = "starcitizen-lug";
     repo = "lug-helper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2z8Le65DQk121jTM3UP25V3Xzq+KUve5XJQmNaQ2IGg=";
+    hash = "sha256-e0pq3E9Jsx9pBRhN0gFJxZPDUbK/Xe84+5AO2/RlsLo=";
   };
 
   buildInputs = [

From 243e0cb0b9b6b3dcf63d04178f4e2e8053a59e44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 07:21:23 +0000
Subject: [PATCH 31/45] pytr: 0.4.1 -> 0.4.2

---
 pkgs/by-name/py/pytr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix
index 5538b60ed159..d75918a0a005 100644
--- a/pkgs/by-name/py/pytr/package.nix
+++ b/pkgs/by-name/py/pytr/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pytr";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytr-org";
     repo = "pytr";
     tag = "v${version}";
-    hash = "sha256-uWG8q6H6q54v3Iq5LOkr7zi5rds+y13O0ai9R9QySdI=";
+    hash = "sha256-7554su1bR3m6wcIcmT64O+x/kvVlDMsG/hkTym25B/Q=";
   };
 
   build-system = with python3Packages; [

From b9b9c6328943ec1cc6de3513758067d08d1f3b19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 08:24:37 +0000
Subject: [PATCH 32/45] all-the-package-names: 2.0.2137 -> 2.0.2146

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 46d2d7a06198..030ce343ece2 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2137";
+  version = "2.0.2146";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-1HabSjZUHjPWkKZc+Xeh11bzb6ycQ1V7GS/XGycFoKc=";
+    hash = "sha256-mPPlBXhnDYTQPATw1Ulb/bk44Q5Q+hUA9tGcxCj0i3w=";
   };
 
-  npmDepsHash = "sha256-zSGpKDcmBYod81wCeoSzOqse1zSao4aURngh55wq6CA=";
+  npmDepsHash = "sha256-yNG6rQRbXRDtmCm2KNZLZ1/ein+QA7/0CjAVIMVp2PI=";
 
   passthru.updateScript = nix-update-script { };
 

From bb4d872f258ea47c68c52487135e7f8a5d70c29a Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 23 Apr 2025 19:52:14 -0400
Subject: [PATCH 33/45] tidal-hifi: 5.18.2 -> 5.19.0

also build from source
---
 pkgs/by-name/ti/tidal-hifi/electron.nix |  31 ++++
 pkgs/by-name/ti/tidal-hifi/package.nix  | 226 ++++++++++++++++--------
 2 files changed, 182 insertions(+), 75 deletions(-)
 create mode 100644 pkgs/by-name/ti/tidal-hifi/electron.nix

diff --git a/pkgs/by-name/ti/tidal-hifi/electron.nix b/pkgs/by-name/ti/tidal-hifi/electron.nix
new file mode 100644
index 000000000000..1d617662f512
--- /dev/null
+++ b/pkgs/by-name/ti/tidal-hifi/electron.nix
@@ -0,0 +1,31 @@
+{
+  fetchzip,
+  lib,
+}:
+let
+  /*
+    see:
+    https://github.com/Mastermindzh/tidal-hifi/blob/master/build/electron-builder.base.yml
+     for the expected version
+  */
+  version = "35.1.1";
+in
+(fetchzip {
+  url = "https://github.com/castlabs/electron-releases/releases/download/v${version}+wvcus/electron-v${version}+wvcus-linux-x64.zip";
+  hash = "sha256-AkPKeG7MrCBlk41qXZxFPRukUPRcIUanq6fJPx5d3RU=";
+  stripRoot = false;
+
+}).overrideAttrs
+  (
+    final: _: {
+      name = "castlabs-electron-${version}";
+      inherit version;
+      pname = "castlabs-electron";
+      passthru.dist = final.finalPackage.outPath;
+
+      meta = {
+        license = lib.licenses.unfreeRedistributable;
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+      };
+    }
+  )
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index e02d2f847fd7..930780f48c3f 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -1,98 +1,109 @@
 {
   lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  callPackage,
+  libdbusmenu,
+  xdg-utils,
+  makeShellWrapper,
+  copyDesktopItems,
+  makeDesktopItem,
   stdenv,
-  fetchurl,
-  autoPatchelfHook,
-  dpkg,
-  makeWrapper,
   wrapGAppsHook3,
-  alsa-lib,
+  glib,
+  gtk3,
+  gtk4,
   at-spi2-atk,
-  at-spi2-core,
-  atk,
+  libdrm,
+  libgbm,
+  libxkbcommon,
+  libxshmfence,
+  libGL,
+  vulkan-loader,
+  alsa-lib,
   cairo,
   cups,
   dbus,
   expat,
-  ffmpeg,
-  fontconfig,
-  freetype,
   gdk-pixbuf,
-  glib,
-  gtk3,
-  libappindicator-gtk3,
-  libdbusmenu,
-  libdrm,
-  libnotify,
-  libpulseaudio,
-  libsecret,
-  libuuid,
-  libxkbcommon,
-  libgbm,
   nss,
+  nspr,
+  libX11,
+  libxcb,
+  libXcomposite,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXrandr,
+  libxkbfile,
   pango,
   systemd,
-  xdg-utils,
-  xorg,
-  libGL,
+  pciutils,
+  libnotify,
+  pipewire,
+  libsecret,
+  libpulseaudio,
+  speechd-minimal,
+
+  castlabs-electron ? callPackage ./electron.nix { },
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tidal-hifi";
-  version = "5.18.2";
+let
+  version = "5.19.0";
 
-  src = fetchurl {
-    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-jo3vnq7ul7e+UsaBswil8EctUxVJMcTxo77YyQ2ncIM=";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-    makeWrapper
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
+  electronLibPath = lib.makeLibraryPath [
     alsa-lib
     at-spi2-atk
-    at-spi2-core
-    atk
     cairo
     cups
     dbus
     expat
-    ffmpeg
-    fontconfig
-    freetype
     gdk-pixbuf
     glib
     gtk3
-    pango
-    systemd
-    libgbm
+    gtk4
     nss
-    libuuid
-    libdrm
+    nspr
+    libX11
+    libxcb
+    libXcomposite
+    libXdamage
+    libXext
+    libXfixes
+    libXrandr
+    libxkbfile
+    pango
+    pciutils
+    stdenv.cc.cc
+    systemd
     libnotify
+    pipewire
     libsecret
     libpulseaudio
+    speechd-minimal
+    libdrm
+    libgbm
     libxkbcommon
-    libappindicator-gtk3
-    xorg.libX11
-    xorg.libxcb
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXScrnSaver
-    xorg.libxshmfence
-    xorg.libXtst
+    libxshmfence
     libGL
+    vulkan-loader
+  ];
+in
+buildNpmPackage {
+  pname = "tidal-hifi";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "Mastermindzh";
+    repo = "tidal-hifi";
+    tag = version;
+    hash = "sha256-/pPmfgKwrtOrEu7YVJTuQF/FIMa+W6uSnFbMFuyURFQ=";
+  };
+
+  nativeBuildInputs = [
+    makeShellWrapper
+    wrapGAppsHook3
+    copyDesktopItems
   ];
 
   runtimeDependencies = [
@@ -102,36 +113,101 @@ stdenv.mkDerivation (finalAttrs: {
     xdg-utils
   ];
 
+  npmDepsHash = "sha256-TNhD/ZkqJtsidAEIOL/WmJZw09BuFgd4ECnzbieNhVY=";
+  forceGitDeps = true;
+  makeCacheWritable = true;
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run compile
+    npm exec electron-builder -- \
+        --dir \
+        --config build/electron-builder.base.yml \
+        -c.electronDist=${castlabs-electron.dist} \
+        -c.electronVersion=${castlabs-electron.version}
+
+    runHook postBuild
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TIDAL Hi-Fi";
+      desktopName = "tidal-hifi";
+      genericName = "TIDAL Hi-Fi";
+      comment = "The web version of listen.tidal.com running in electron with hifi support thanks to widevine.";
+      icon = "tidal-hifi";
+      startupNotify = true;
+      terminal = false;
+      type = "Application";
+      categories = [
+        "Network"
+        "Application"
+        "AudioVideo"
+        "Audio"
+        "Video"
+      ];
+      startupWMClass = "tidal-hifi";
+      mimeTypes = [ "x-scheme-handler/tidal" ];
+      extraConfig.X-PulseAudio-Properties = "media.role=music";
+    })
+  ];
+
+  dontWrapGApps = true;
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin"
-    cp -R "opt" "$out"
-    cp -R "usr/share" "$out/share"
-    chmod -R g-w "$out"
+    for i in 16 22 24 32 48 64 128 256 384; do
+      install -Dm644 "assets/icons/$i"x"$i.png" "$out/share/icons/hicolor/$i"x"$i/apps/tidal-hifi.png"
+    done
+
+    mv dist/linux-unpacked "$out/share/tidal-hifi"
 
     runHook postInstall
   '';
 
+  # see: pkgs/development/tools/electron/binary/generic.nix
   postFixup = ''
-    makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${electronLibPath}:$out/share/tidal-hifi" \
+      $out/share/tidal-hifi/tidal-hifi \
+      $out/share/tidal-hifi/chrome_crashpad_handler
+
+    # patch libANGLE
+    patchelf \
+      --set-rpath "${
+        lib.makeLibraryPath [
+          libGL
+          pciutils
+          vulkan-loader
+        ]
+      }" \
+      $out/share/tidal-hifi/lib*GL*
+
+    # replace bundled vulkan-loader
+    rm "$out/share/tidal-hifi/libvulkan.so.1"
+    ln -s -t "$out/share/tidal-hifi" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+
+    makeShellWrapper "$out/share/tidal-hifi/tidal-hifi" "$out/bin/tidal-hifi" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       "''${gappsWrapperArgs[@]}"
-    substituteInPlace $out/share/applications/tidal-hifi.desktop \
-      --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
   '';
 
   meta = {
-    changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}";
     description = "Web version of Tidal running in electron with hifi support thanks to widevine";
     homepage = "https://github.com/Mastermindzh/tidal-hifi";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
+      gerg-l
       qbit
       spikespaz
     ];
     platforms = lib.platforms.linux;
     mainProgram = "tidal-hifi";
   };
-})
+}

From 15c7d2f622bcc38b02df7aa1933608a7a96305bc Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Fri, 2 May 2025 13:10:58 +0200
Subject: [PATCH 34/45] vimPlugins.oil-git-status-nvim: init at 2025-04-03

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  4 ++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1ab5959ed15b..1890f5f1893d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11453,6 +11453,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  oil-git-status-nvim = buildVimPlugin {
+    pname = "oil-git-status.nvim";
+    version = "2025-04-03";
+    src = fetchFromGitHub {
+      owner = "refractalize";
+      repo = "oil-git-status.nvim";
+      rev = "4b5cf53842c17a09420919e655a6a559da3112d7";
+      sha256 = "1jzw6lkvi9xxzqy8xz056xlb45byr1arklh87zmyf0nj9plm2nsp";
+    };
+    meta.homepage = "https://github.com/refractalize/oil-git-status.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   ollama-nvim = buildVimPlugin {
     pname = "ollama.nvim";
     version = "2024-06-09";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a3a822ab1baf..35f1bf7be7cd 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2623,6 +2623,10 @@ in
     ];
   };
 
+  oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs {
+    dependencies = [ self.oil-nvim ];
+  };
+
   ollama-nvim = super.ollama-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index b296c0478293..bed1d242ae07 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -879,6 +879,7 @@ https://github.com/obsidian-nvim/obsidian.nvim/,HEAD,
 https://github.com/nvimdev/oceanic-material/,,
 https://github.com/mhartington/oceanic-next/,,
 https://github.com/pwntester/octo.nvim/,,
+https://github.com/refractalize/oil-git-status.nvim/,HEAD,
 https://github.com/nomnivore/ollama.nvim/,HEAD,
 https://github.com/yonlu/omni.vim/,,
 https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,

From 9849e6fc7660e70cd1eae7769fa5ee9408bc78d4 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 2 May 2025 14:03:04 +0200
Subject: [PATCH 35/45] sherlock: fix build

---
 pkgs/by-name/sh/sherlock/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix
index 436066f9e30a..196a15ad6963 100644
--- a/pkgs/by-name/sh/sherlock/package.nix
+++ b/pkgs/by-name/sh/sherlock/package.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   makeWrapper,
   python3,
-  poetry,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -59,7 +58,6 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
-    poetry
     poetry-core
     jsonschema
     openpyxl

From 653b0ceac942d5db57db41072b5e801a2bd15ea5 Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@users.noreply.github.com>
Date: Fri, 2 May 2025 14:09:15 +0200
Subject: [PATCH 36/45] unleash-client-haskell/unleash-client-haskell-core:
 remove maintainer

---
 .../haskell-modules/configuration-hackage2nix/main.yaml        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index e03097739a82..ed1759973315 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -178,9 +178,6 @@ package-maintainers:
     - vulkan-utils
   erictapen:
     - hakyll
-  evenbrenden:
-    - unleash-client-haskell
-    - unleash-client-haskell-core
   Gabriella439:
     - annah
     - bench

From a1df13e2306803132f54511769412f746f1a9f7a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 1 May 2025 21:56:24 +0200
Subject: [PATCH 37/45] python3Packages.pytest-postgresql-darwin: disable
 checkPhase on darwin

This is because the checkPhase can't be run consistently on darwin due
to a nix bug described in #371242.
---
 .../development/python-modules/pytest-postgresql/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix
index c989f2748348..c5abbb07447b 100644
--- a/pkgs/development/python-modules/pytest-postgresql/default.nix
+++ b/pkgs/development/python-modules/pytest-postgresql/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
@@ -62,7 +63,9 @@ buildPythonPackage rec {
     "pytest_postgresql.executor"
   ];
 
-  __darwinAllowLocalNetworking = true;
+  # Can't reliably run checkPhase on darwin because of nix bug, see:
+  #  https://github.com/NixOS/nixpkgs/issues/371242
+  doCheck = !stdenv.buildPlatform.isDarwin;
 
   meta = {
     homepage = "https://pypi.python.org/pypi/pytest-postgresql";

From a4d6a7e3633c649b374817472b5a29da7b0ab9c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 12:57:05 +0000
Subject: [PATCH 38/45] encrypted-dns-server: 0.9.16 -> 0.9.17

---
 pkgs/by-name/en/encrypted-dns-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix
index dd8aa1a4c326..57e42e80ce33 100644
--- a/pkgs/by-name/en/encrypted-dns-server/package.nix
+++ b/pkgs/by-name/en/encrypted-dns-server/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "encrypted-dns-server";
-  version = "0.9.16";
+  version = "0.9.17";
 
   src = fetchFromGitHub {
     owner = "DNSCrypt";
     repo = "encrypted-dns-server";
     tag = version;
-    hash = "sha256-llBMOqmxEcysoBsRg5s1uqCyR6+ilTgBI7BaeSDVoEw=";
+    hash = "sha256-un7607HQ7s7G2GPTmYVT3wK/ePLNVyV+A2mtKt0YGsw=";
   };
 
-  cargoHash = "sha256-33XcfiktgDG34aamw8X3y0QkybVENUJxLhx47WZUpFc=";
+  cargoHash = "sha256-qhY1LgtV0Kmj/at9EG7Y+swN1Oy0/SzRCr7U8xVh8KA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From f7a1a09564ab8499a966bd0ded9225d85f5d9603 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 May 2025 13:17:45 +0200
Subject: [PATCH 39/45] python312Packages.gpu-rir: init at
 0-unstable-2025-01-20

Co-authored-by: SomeoneSerge <else@someonex.net>
---
 .../python-modules/gpu-rir/default.nix        | 83 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/python-modules/gpu-rir/default.nix

diff --git a/pkgs/development/python-modules/gpu-rir/default.nix b/pkgs/development/python-modules/gpu-rir/default.nix
new file mode 100644
index 000000000000..a1d0fda616d2
--- /dev/null
+++ b/pkgs/development/python-modules/gpu-rir/default.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cmake,
+  setuptools,
+
+  # nativeBuildInputs
+  autoAddDriverRunpath,
+  cudaPackages,
+
+  # dependencies
+  numpy,
+  scipy,
+}:
+
+buildPythonPackage {
+  pname = "gpu-rir";
+  version = "0-unstable-2025-01-20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DavidDiazGuerra";
+    repo = "gpuRIR";
+    rev = "fd8af43a4a113d3c2c05f0085a0119ecb1f1a484";
+    hash = "sha256-nYi91iaNb9gswYzXW7aNpD3yYIgMvTen9r02G4d6joo=";
+  };
+
+  # Inject cmakeFlags in the cmake call
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        "cmake_args = [" \
+        "cmake_args = os.environ.get('cmakeFlags', \"\").split() + ["
+  '';
+
+  build-system = [
+    cmake
+    setuptools
+  ];
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    autoAddDriverRunpath
+    cudaPackages.cuda_nvcc
+  ];
+
+  # TODO: Investigate why (deprecated) FindCUDA fails to set these variables
+  cmakeFlags = [
+    (lib.cmakeFeature "CUDA_CUFFT_LIBARIES" "${lib.getLib cudaPackages.libcufft}/lib/libcufft.so")
+    (lib.cmakeFeature "CUDA_curand_LIBRARY" "${lib.getLib cudaPackages.libcurand}/lib/libcurand.so")
+  ];
+
+  buildInputs = with cudaPackages; [
+    cuda_cccl # <nv/target>
+    cuda_cudart # cuda_runtime.h
+    libcufft
+    libcurand
+  ];
+
+  dependencies = [
+    numpy
+    scipy
+  ];
+
+  pythonImportsCheck = [ "gpuRIR" ];
+  # Fails at import because there is no GPU access in the sandbox:
+  # Check whether the following modules can be imported: gpuRIR
+  # GPUassert: CUDA driver version is insufficient for CUDA runtime version /build/source/src/gpuRIR_cuda.cu 1037
+  dontUsePythonImportsCheck = true;
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Python library for Room Impulse Response (RIR) simulation with GPU acceleration";
+    homepage = "https://github.com/DavidDiazGuerra/gpuRIR";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abbdf0421c2f..12b827cc16b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5914,6 +5914,8 @@ self: super: with self; {
 
   gptcache = callPackage ../development/python-modules/gptcache { };
 
+  gpu-rir = callPackage ../development/python-modules/gpu-rir { };
+
   gpuctypes = callPackage ../development/python-modules/gpuctypes { };
 
   gpustat = callPackage ../development/python-modules/gpustat { };

From e13ad2c92a3f2c70d59bd76a3f455916dbb8208f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 2 May 2025 08:47:25 -0400
Subject: [PATCH 40/45] golden-cheetah: 3.7-DEV2408 -> 3.7

https://github.com/GoldenCheetah/GoldenCheetah/releases/tag/v3.7
---
 pkgs/by-name/go/golden-cheetah/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/golden-cheetah/package.nix b/pkgs/by-name/go/golden-cheetah/package.nix
index dd33b079b74d..f1dde6dc67db 100644
--- a/pkgs/by-name/go/golden-cheetah/package.nix
+++ b/pkgs/by-name/go/golden-cheetah/package.nix
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "golden-cheetah";
-  version = "3.7-DEV2408";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "GoldenCheetah";
     repo = "GoldenCheetah";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
+    hash = "sha256-INlkFWugIoln7wrmgLZUC/Ye8eV+mlT6BZ0ZdP7CiqE=";
   };
 
   buildInputs =

From d89230fd4255e5213b93f37eff81cb0e4ea886b1 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 2 May 2025 10:24:35 +0200
Subject: [PATCH 41/45] pharo: 10.3.1 -> 10.3.4

---
 pkgs/by-name/ph/pharo/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix
index aeca44373b14..b5ed2cb7b5c3 100644
--- a/pkgs/by-name/ph/pharo/package.nix
+++ b/pkgs/by-name/ph/pharo/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pharo";
-  version = "10.3.1-6cdb1e5";
+  version = "10.3.4+3.884643b";
 
   src = fetchzip {
     # It is necessary to download from there instead of from the repository because that archive
     # also contains artifacts necessary for the bootstrapping.
-    url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-${finalAttrs.version}-Linux-x86_64-c-src.zip";
-    hash = "sha256-Oskbo0ZMh2Wr8uY9BjA54AhFVDEuzs4AN8cpO02gdfY=";
+    url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-v${finalAttrs.version}-Linux-x86_64-c-src.zip";
+    hash = "sha256-JBN0gPVMIUFzrdLqrCnCvf4cbZMfpluO2/jCxk3U+M8=";
   };
 
   strictDeps = true;
@@ -59,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-Wno-incompatible-pointer-types"
   ];
 
+  # Fix missing version.info
+  preBuild = ''
+    mkdir -p /build/source/build/
+    echo "${finalAttrs.version}" > /build/source/build/version.info
+  '';
+
   installPhase = ''
     runHook preInstall
 

From 5981fe334230bdfce9054d663b49fc46c521fe5e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 May 2025 16:55:07 +0200
Subject: [PATCH 42/45] python312Packages.textual: 3.1.1 -> 3.2.0

Diff: https://github.com/Textualize/textual/compare/refs/tags/v3.1.1...refs/tags/v3.2.0

Changelog: https://github.com/Textualize/textual/blob/v3.2.0/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 7e1b3db373d3..8eb126bb4c56 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "3.1.1";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-emF6LpjVCgxC+Cf+LhFrawc3rxfMnZtyijmoVg0ZJbQ=";
+    hash = "sha256-kPu8qjIbsSOgIdBTubjz6gR58Myu2ioWdpzk5LEedU4=";
   };
 
   build-system = [ poetry-core ];

From 894857b781dd68a1f2df789c1c2c348b09dbfe85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 May 2025 18:11:06 +0200
Subject: [PATCH 43/45] nss_latest: 3.110 -> 3.111

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_111.rst
---
 pkgs/development/libraries/nss/latest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 3b2264486562..95438a3c12c2 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.110";
-  hash = "sha256-OA2nBAbGLgTeEo2RfK335UoCfQM0lXpnOtoyFCLb84g=";
+  version = "3.111";
+  hash = "sha256-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs=";
 }

From 154f79b231b33f9dd70291f20753604c35811f63 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Fri, 2 May 2025 17:22:55 +0200
Subject: [PATCH 44/45] vimPlugins.kanagawa-paper-nvim: init at 2025-04-27

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  8 ++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 22 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1890f5f1893d..3d348998ffe6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6548,6 +6548,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  kanagawa-paper-nvim = buildVimPlugin {
+    pname = "kanagawa-paper.nvim";
+    version = "2025-04-27";
+    src = fetchFromGitHub {
+      owner = "thesimonho";
+      repo = "kanagawa-paper.nvim";
+      rev = "4f41353f6a2bf9f25b2466a0f1eb6883d8fd09c1";
+      sha256 = "0gan0jqn4azkqln5xsnffpyjqmzqv1wwv02xv2d0yykmlqk9yqc8";
+    };
+    meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   kdl-vim = buildVimPlugin {
     pname = "kdl.vim";
     version = "2023-02-20";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 35f1bf7be7cd..c6935696cd7b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1457,6 +1457,14 @@ in
     passthru.python3Dependencies = ps: [ ps.jupytext ];
   };
 
+  kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs {
+    nvimSkipModules = [
+      # skipping wezterm theme switcher since it relies on a wezterm module
+      # that does not seem to be available, tried to build setting wezterm-nvim as a dep
+      "wezterm.theme_switcher"
+    ];
+  };
+
   kulala-nvim = super.kulala-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index bed1d242ae07..1cb7a70d32c5 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -501,6 +501,7 @@ https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
+https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
 https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,

From 9338d924dbe0c6b93daec3bf435322812fd176fe Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 2 May 2025 18:20:17 +0200
Subject: [PATCH 45/45] lib.meta.availableOn: Return false if pkg parameter is
 null

To fix overriding packages that checks for platform compatibility, like pipewire.

`pipewire` contains the following logic to enable support for ldac depending on library platform compatibility:
```nix
ldacbtSupport = lib.meta.availableOn stdenv.hostPlatform ldacbt
```

Which is used later in the expression to create a Meson flag:
```nix
(lib.mesonEnable "bluez5-codec-ldac" (bluezSupport && ldacbtSupport))
```

This means that attempting to build `pipewire` without `ldacbt` like:
```nix
pipewire.override {
  ldacbt = null;
}
```
will fail because the the Meson flag indicates the feature should be enabled, but the library is passed to `buildInputs` as `null`.
---
 lib/meta.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index ee234d94489b..ad4f770806dd 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -289,7 +289,8 @@ rec {
   */
   availableOn =
     platform: pkg:
-    ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms)
+    pkg != null
+    && ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms)
     && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or [ ]);
 
   /**