pyrox.dev / nixpkgs
lol
fork atom

dmenu-rs: fix issue 222351 and bump to 5.5.2

Fix the dmenu-rs package derivation, which was broken after changes to
the rustPlatform nixpkgs tooling. The issue linked below was
specifically raised on an early version of NixOS 23.05.

This is through no fault of those changes. In fact, the brittle hack in
the dmenu-rs derivation that broke can now be entirely removed because
of the very changes that broke them.

This commit also bumps dmenu-rs from 5.5.1 to 5.5.2. See upstream for
details on the changes.

See https://github.com/NixOS/nixpkgs/issues/222351
See https://github.com/NixOS/nixpkgs/pull/218472
See https://github.com/Shizcow/dmenu-rs

Benjamin Edward Webb 5765305d 19cf008b

+435 -213
unified split
+420 -197
pkgs/applications/misc/dmenu-rs/Cargo.lock
··· 4 4 5 5 [[package]] 6 6 name = "aho-corasick" 7 - version = "0.7.19" 7 + version = "0.7.20" 8 8 source = "registry+https://github.com/rust-lang/crates.io-index" 9 - checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" 9 + checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" 10 10 dependencies = [ 11 11 "memchr", 12 12 ] ··· 21 21 ] 22 22 23 23 [[package]] 24 - name = "arrayref" 25 - version = "0.3.6" 24 + name = "anstream" 25 + version = "0.2.6" 26 + source = "registry+https://github.com/rust-lang/crates.io-index" 27 + checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" 28 + dependencies = [ 29 + "anstyle", 30 + "anstyle-parse", 31 + "anstyle-wincon", 32 + "concolor-override", 33 + "concolor-query", 34 + "is-terminal", 35 + "utf8parse", 36 + ] 37 + 38 + [[package]] 39 + name = "anstyle" 40 + version = "0.3.5" 26 41 source = "registry+https://github.com/rust-lang/crates.io-index" 27 - checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" 42 + checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" 28 43 29 44 [[package]] 30 - name = "arrayvec" 31 - version = "0.5.2" 45 + name = "anstyle-parse" 46 + version = "0.1.1" 32 47 source = "registry+https://github.com/rust-lang/crates.io-index" 33 - checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" 48 + checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" 49 + dependencies = [ 50 + "utf8parse", 51 + ] 52 + 53 + [[package]] 54 + name = "anstyle-wincon" 55 + version = "0.2.0" 56 + source = "registry+https://github.com/rust-lang/crates.io-index" 57 + checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" 58 + dependencies = [ 59 + "anstyle", 60 + "windows-sys", 61 + ] 34 62 35 63 [[package]] 36 64 name = "atty" ··· 38 66 source = "registry+https://github.com/rust-lang/crates.io-index" 39 67 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" 40 68 dependencies = [ 41 - "hermit-abi", 69 + "hermit-abi 0.1.19", 42 70 "libc", 43 71 "winapi", 44 72 ] 45 73 46 74 [[package]] 47 - name = "base64" 48 - version = "0.13.1" 49 - source = "registry+https://github.com/rust-lang/crates.io-index" 50 - checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" 51 - 52 - [[package]] 53 75 name = "bindgen" 54 - version = "0.53.3" 76 + version = "0.64.0" 55 77 source = "registry+https://github.com/rust-lang/crates.io-index" 56 - checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" 78 + checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" 57 79 dependencies = [ 58 80 "bitflags", 59 81 "cexpr", 60 - "cfg-if 0.1.10", 61 82 "clang-sys", 62 - "clap", 63 - "env_logger", 64 83 "lazy_static", 65 84 "lazycell", 66 85 "log", ··· 70 89 "regex", 71 90 "rustc-hash", 72 91 "shlex", 92 + "syn 1.0.109", 73 93 "which", 74 94 ] 75 95 ··· 80 100 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" 81 101 82 102 [[package]] 83 - name = "blake2b_simd" 84 - version = "0.5.11" 85 - source = "registry+https://github.com/rust-lang/crates.io-index" 86 - checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" 87 - dependencies = [ 88 - "arrayref", 89 - "arrayvec", 90 - "constant_time_eq", 91 - ] 92 - 93 - [[package]] 94 103 name = "block" 95 104 version = "0.1.6" 96 105 source = "registry+https://github.com/rust-lang/crates.io-index" 97 106 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" 98 107 99 108 [[package]] 100 - name = "bstr" 101 - version = "0.2.17" 102 - source = "registry+https://github.com/rust-lang/crates.io-index" 103 - checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" 104 - dependencies = [ 105 - "lazy_static", 106 - "memchr", 107 - "regex-automata", 108 - "serde", 109 - ] 110 - 111 - [[package]] 112 - name = "byteorder" 113 - version = "1.4.3" 114 - source = "registry+https://github.com/rust-lang/crates.io-index" 115 - checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" 116 - 117 - [[package]] 118 109 name = "cc" 119 - version = "1.0.76" 110 + version = "1.0.79" 120 111 source = "registry+https://github.com/rust-lang/crates.io-index" 121 - checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" 112 + checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" 122 113 123 114 [[package]] 124 115 name = "cexpr" 125 - version = "0.4.0" 116 + version = "0.6.0" 126 117 source = "registry+https://github.com/rust-lang/crates.io-index" 127 - checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" 118 + checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" 128 119 dependencies = [ 129 120 "nom", 130 121 ] 131 122 132 123 [[package]] 133 124 name = "cfg-if" 134 - version = "0.1.10" 135 - source = "registry+https://github.com/rust-lang/crates.io-index" 136 - checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" 137 - 138 - [[package]] 139 - name = "cfg-if" 140 125 version = "1.0.0" 141 126 source = "registry+https://github.com/rust-lang/crates.io-index" 142 127 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 143 128 144 129 [[package]] 145 130 name = "clang-sys" 146 - version = "0.29.3" 131 + version = "1.6.0" 147 132 source = "registry+https://github.com/rust-lang/crates.io-index" 148 - checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" 133 + checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" 149 134 dependencies = [ 150 135 "glob", 151 136 "libc", ··· 161 146 "ansi_term", 162 147 "atty", 163 148 "bitflags", 164 - "strsim", 149 + "strsim 0.8.0", 165 150 "textwrap", 166 151 "unicode-width", 167 152 "vec_map", 168 - "yaml-rust", 153 + "yaml-rust 0.3.5", 154 + ] 155 + 156 + [[package]] 157 + name = "clap" 158 + version = "4.2.0" 159 + source = "registry+https://github.com/rust-lang/crates.io-index" 160 + checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" 161 + dependencies = [ 162 + "clap_builder", 163 + "clap_derive", 164 + "once_cell", 165 + ] 166 + 167 + [[package]] 168 + name = "clap_builder" 169 + version = "4.2.0" 170 + source = "registry+https://github.com/rust-lang/crates.io-index" 171 + checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" 172 + dependencies = [ 173 + "anstream", 174 + "anstyle", 175 + "bitflags", 176 + "clap_lex", 177 + "strsim 0.10.0", 169 178 ] 170 179 171 180 [[package]] 181 + name = "clap_derive" 182 + version = "4.2.0" 183 + source = "registry+https://github.com/rust-lang/crates.io-index" 184 + checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" 185 + dependencies = [ 186 + "heck", 187 + "proc-macro2", 188 + "quote", 189 + "syn 2.0.11", 190 + ] 191 + 192 + [[package]] 193 + name = "clap_lex" 194 + version = "0.4.1" 195 + source = "registry+https://github.com/rust-lang/crates.io-index" 196 + checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" 197 + 198 + [[package]] 172 199 name = "clipboard" 173 200 version = "0.5.0" 174 201 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 192 219 193 220 [[package]] 194 221 name = "cmake" 195 - version = "0.1.49" 222 + version = "0.1.50" 196 223 source = "registry+https://github.com/rust-lang/crates.io-index" 197 - checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" 224 + checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" 198 225 dependencies = [ 199 226 "cc", 200 227 ] 201 228 202 229 [[package]] 230 + name = "concolor-override" 231 + version = "1.0.0" 232 + source = "registry+https://github.com/rust-lang/crates.io-index" 233 + checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" 234 + 235 + [[package]] 236 + name = "concolor-query" 237 + version = "0.3.3" 238 + source = "registry+https://github.com/rust-lang/crates.io-index" 239 + checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" 240 + dependencies = [ 241 + "windows-sys", 242 + ] 243 + 244 + [[package]] 203 245 name = "config" 204 246 version = "0.0.0" 205 247 dependencies = [ 206 248 "glob", 207 - "itertools", 249 + "itertools 0.10.5", 208 250 "man_dmenu", 209 251 "prettytable-rs", 210 252 "termcolor", 211 - "yaml-rust", 212 - ] 213 - 214 - [[package]] 215 - name = "constant_time_eq" 216 - version = "0.1.5" 217 - source = "registry+https://github.com/rust-lang/crates.io-index" 218 - checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" 219 - 220 - [[package]] 221 - name = "crossbeam-utils" 222 - version = "0.8.12" 223 - source = "registry+https://github.com/rust-lang/crates.io-index" 224 - checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" 225 - dependencies = [ 226 - "cfg-if 1.0.0", 253 + "yaml-rust 0.4.5", 227 254 ] 228 255 229 256 [[package]] 230 257 name = "csv" 231 - version = "1.1.6" 258 + version = "1.2.1" 232 259 source = "registry+https://github.com/rust-lang/crates.io-index" 233 - checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" 260 + checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" 234 261 dependencies = [ 235 - "bstr", 236 262 "csv-core", 237 263 "itoa", 238 264 "ryu", ··· 249 275 ] 250 276 251 277 [[package]] 252 - name = "dirs" 253 - version = "1.0.5" 278 + name = "dirs-next" 279 + version = "2.0.0" 280 + source = "registry+https://github.com/rust-lang/crates.io-index" 281 + checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" 282 + dependencies = [ 283 + "cfg-if", 284 + "dirs-sys-next", 285 + ] 286 + 287 + [[package]] 288 + name = "dirs-sys-next" 289 + version = "0.1.2" 254 290 source = "registry+https://github.com/rust-lang/crates.io-index" 255 - checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" 291 + checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" 256 292 dependencies = [ 257 293 "libc", 258 294 "redox_users", ··· 263 299 name = "dmenu-build" 264 300 version = "0.0.0" 265 301 dependencies = [ 266 - "clap", 302 + "clap 2.34.0", 267 303 "clipboard", 268 - "itertools", 304 + "itertools 0.9.0", 269 305 "lazy_static", 270 306 "libc", 271 307 "overrider", ··· 278 314 "termcolor", 279 315 "unicode-segmentation", 280 316 "x11", 281 - "yaml-rust", 317 + "yaml-rust 0.3.5", 282 318 ] 283 319 284 320 [[package]] 285 321 name = "either" 286 - version = "1.8.0" 322 + version = "1.8.1" 287 323 source = "registry+https://github.com/rust-lang/crates.io-index" 288 - checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" 324 + checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" 289 325 290 326 [[package]] 291 327 name = "encode_unicode" 292 - version = "0.3.6" 328 + version = "1.0.0" 293 329 source = "registry+https://github.com/rust-lang/crates.io-index" 294 - checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" 330 + checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" 295 331 296 332 [[package]] 297 - name = "env_logger" 298 - version = "0.7.1" 333 + name = "errno" 334 + version = "0.2.8" 299 335 source = "registry+https://github.com/rust-lang/crates.io-index" 300 - checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" 336 + checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" 301 337 dependencies = [ 302 - "atty", 303 - "humantime", 304 - "log", 305 - "regex", 306 - "termcolor", 338 + "errno-dragonfly", 339 + "libc", 340 + "winapi", 341 + ] 342 + 343 + [[package]] 344 + name = "errno-dragonfly" 345 + version = "0.1.2" 346 + source = "registry+https://github.com/rust-lang/crates.io-index" 347 + checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" 348 + dependencies = [ 349 + "cc", 350 + "libc", 307 351 ] 308 352 309 353 [[package]] ··· 329 373 330 374 [[package]] 331 375 name = "getrandom" 332 - version = "0.1.16" 376 + version = "0.2.8" 333 377 source = "registry+https://github.com/rust-lang/crates.io-index" 334 - checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" 378 + checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" 335 379 dependencies = [ 336 - "cfg-if 1.0.0", 380 + "cfg-if", 337 381 "libc", 338 382 "wasi", 339 383 ] 340 384 341 385 [[package]] 342 386 name = "glob" 343 - version = "0.3.0" 387 + version = "0.3.1" 344 388 source = "registry+https://github.com/rust-lang/crates.io-index" 345 - checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" 389 + checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" 346 390 347 391 [[package]] 348 392 name = "headers" ··· 353 397 ] 354 398 355 399 [[package]] 400 + name = "heck" 401 + version = "0.4.1" 402 + source = "registry+https://github.com/rust-lang/crates.io-index" 403 + checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" 404 + 405 + [[package]] 356 406 name = "hermit-abi" 357 407 version = "0.1.19" 358 408 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 362 412 ] 363 413 364 414 [[package]] 365 - name = "humantime" 366 - version = "1.3.0" 415 + name = "hermit-abi" 416 + version = "0.3.1" 417 + source = "registry+https://github.com/rust-lang/crates.io-index" 418 + checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" 419 + 420 + [[package]] 421 + name = "io-lifetimes" 422 + version = "1.0.9" 367 423 source = "registry+https://github.com/rust-lang/crates.io-index" 368 - checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" 424 + checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" 369 425 dependencies = [ 370 - "quick-error", 426 + "hermit-abi 0.3.1", 427 + "libc", 428 + "windows-sys", 429 + ] 430 + 431 + [[package]] 432 + name = "is-terminal" 433 + version = "0.4.5" 434 + source = "registry+https://github.com/rust-lang/crates.io-index" 435 + checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" 436 + dependencies = [ 437 + "hermit-abi 0.3.1", 438 + "io-lifetimes", 439 + "rustix", 440 + "windows-sys", 371 441 ] 372 442 373 443 [[package]] ··· 380 450 ] 381 451 382 452 [[package]] 453 + name = "itertools" 454 + version = "0.10.5" 455 + source = "registry+https://github.com/rust-lang/crates.io-index" 456 + checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" 457 + dependencies = [ 458 + "either", 459 + ] 460 + 461 + [[package]] 383 462 name = "itoa" 384 - version = "0.4.8" 463 + version = "1.0.6" 385 464 source = "registry+https://github.com/rust-lang/crates.io-index" 386 - checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" 465 + checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" 387 466 388 467 [[package]] 389 468 name = "lazy_static" ··· 399 478 400 479 [[package]] 401 480 name = "libc" 402 - version = "0.2.137" 481 + version = "0.2.140" 403 482 source = "registry+https://github.com/rust-lang/crates.io-index" 404 - checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" 483 + checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" 405 484 406 485 [[package]] 407 486 name = "libloading" 408 - version = "0.5.2" 487 + version = "0.7.4" 409 488 source = "registry+https://github.com/rust-lang/crates.io-index" 410 - checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" 489 + checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" 411 490 dependencies = [ 412 - "cc", 491 + "cfg-if", 413 492 "winapi", 414 493 ] 494 + 495 + [[package]] 496 + name = "linked-hash-map" 497 + version = "0.5.6" 498 + source = "registry+https://github.com/rust-lang/crates.io-index" 499 + checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" 500 + 501 + [[package]] 502 + name = "linux-raw-sys" 503 + version = "0.1.4" 504 + source = "registry+https://github.com/rust-lang/crates.io-index" 505 + checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" 415 506 416 507 [[package]] 417 508 name = "log" ··· 419 510 source = "registry+https://github.com/rust-lang/crates.io-index" 420 511 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" 421 512 dependencies = [ 422 - "cfg-if 1.0.0", 513 + "cfg-if", 423 514 ] 424 515 425 516 [[package]] ··· 435 526 name = "man_dmenu" 436 527 version = "0.1.0" 437 528 dependencies = [ 438 - "itertools", 529 + "itertools 0.10.5", 439 530 ] 440 531 441 532 [[package]] ··· 443 534 version = "2.5.0" 444 535 source = "registry+https://github.com/rust-lang/crates.io-index" 445 536 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" 537 + 538 + [[package]] 539 + name = "minimal-lexical" 540 + version = "0.2.1" 541 + source = "registry+https://github.com/rust-lang/crates.io-index" 542 + checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" 446 543 447 544 [[package]] 448 545 name = "nom" 449 - version = "5.1.2" 546 + version = "7.1.3" 450 547 source = "registry+https://github.com/rust-lang/crates.io-index" 451 - checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" 548 + checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" 452 549 dependencies = [ 453 550 "memchr", 454 - "version_check", 551 + "minimal-lexical", 455 552 ] 456 553 457 554 [[package]] ··· 484 581 ] 485 582 486 583 [[package]] 584 + name = "once_cell" 585 + version = "1.17.1" 586 + source = "registry+https://github.com/rust-lang/crates.io-index" 587 + checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" 588 + 589 + [[package]] 487 590 name = "overrider" 488 591 version = "0.7.0" 489 592 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 491 594 dependencies = [ 492 595 "proc-macro2", 493 596 "quote", 494 - "syn", 597 + "syn 1.0.109", 495 598 ] 496 599 497 600 [[package]] ··· 501 604 checksum = "1d9709eba39b602b089deaf80b123e5c8ecfd071aab827a66c1a58412074fbcc" 502 605 dependencies = [ 503 606 "glob", 504 - "syn", 607 + "syn 1.0.109", 505 608 ] 506 609 507 610 [[package]] ··· 527 630 528 631 [[package]] 529 632 name = "prettytable-rs" 530 - version = "0.8.0" 633 + version = "0.10.0" 531 634 source = "registry+https://github.com/rust-lang/crates.io-index" 532 - checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" 635 + checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" 533 636 dependencies = [ 534 - "atty", 535 637 "csv", 536 638 "encode_unicode", 639 + "is-terminal", 537 640 "lazy_static", 538 641 "term", 539 642 "unicode-width", ··· 541 644 542 645 [[package]] 543 646 name = "proc-macro2" 544 - version = "1.0.47" 647 + version = "1.0.54" 545 648 source = "registry+https://github.com/rust-lang/crates.io-index" 546 - checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" 649 + checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" 547 650 dependencies = [ 548 651 "unicode-ident", 549 652 ] ··· 555 658 checksum = "fd16b1c456def2ad84b3574651f069541dea178ee688e882943cb21232a5cb01" 556 659 dependencies = [ 557 660 "glob", 558 - "itertools", 661 + "itertools 0.9.0", 559 662 ] 560 663 561 664 [[package]] 562 - name = "quick-error" 563 - version = "1.2.3" 564 - source = "registry+https://github.com/rust-lang/crates.io-index" 565 - checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" 566 - 567 - [[package]] 568 665 name = "quote" 569 - version = "1.0.21" 666 + version = "1.0.26" 570 667 source = "registry+https://github.com/rust-lang/crates.io-index" 571 - checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" 668 + checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" 572 669 dependencies = [ 573 670 "proc-macro2", 574 671 ] 575 672 576 673 [[package]] 577 674 name = "redox_syscall" 578 - version = "0.1.57" 675 + version = "0.2.16" 579 676 source = "registry+https://github.com/rust-lang/crates.io-index" 580 - checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" 677 + checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" 678 + dependencies = [ 679 + "bitflags", 680 + ] 581 681 582 682 [[package]] 583 683 name = "redox_users" 584 - version = "0.3.5" 684 + version = "0.4.3" 585 685 source = "registry+https://github.com/rust-lang/crates.io-index" 586 - checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" 686 + checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" 587 687 dependencies = [ 588 688 "getrandom", 589 689 "redox_syscall", 590 - "rust-argon2", 690 + "thiserror", 591 691 ] 592 692 593 693 [[package]] 594 694 name = "regex" 595 - version = "1.7.0" 695 + version = "1.7.3" 596 696 source = "registry+https://github.com/rust-lang/crates.io-index" 597 - checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" 697 + checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" 598 698 dependencies = [ 599 699 "aho-corasick", 600 700 "memchr", ··· 602 702 ] 603 703 604 704 [[package]] 605 - name = "regex-automata" 606 - version = "0.1.10" 607 - source = "registry+https://github.com/rust-lang/crates.io-index" 608 - checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" 609 - 610 - [[package]] 611 705 name = "regex-syntax" 612 - version = "0.6.28" 706 + version = "0.6.29" 613 707 source = "registry+https://github.com/rust-lang/crates.io-index" 614 - checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" 615 - 616 - [[package]] 617 - name = "rust-argon2" 618 - version = "0.8.3" 619 - source = "registry+https://github.com/rust-lang/crates.io-index" 620 - checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" 621 - dependencies = [ 622 - "base64", 623 - "blake2b_simd", 624 - "constant_time_eq", 625 - "crossbeam-utils", 626 - ] 708 + checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" 627 709 628 710 [[package]] 629 711 name = "rustc-hash" ··· 651 733 ] 652 734 653 735 [[package]] 736 + name = "rustix" 737 + version = "0.36.11" 738 + source = "registry+https://github.com/rust-lang/crates.io-index" 739 + checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" 740 + dependencies = [ 741 + "bitflags", 742 + "errno", 743 + "io-lifetimes", 744 + "libc", 745 + "linux-raw-sys", 746 + "windows-sys", 747 + ] 748 + 749 + [[package]] 750 + name = "rustversion" 751 + version = "1.0.12" 752 + source = "registry+https://github.com/rust-lang/crates.io-index" 753 + checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" 754 + 755 + [[package]] 654 756 name = "ryu" 655 - version = "1.0.11" 757 + version = "1.0.13" 656 758 source = "registry+https://github.com/rust-lang/crates.io-index" 657 - checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" 759 + checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" 658 760 659 761 [[package]] 660 762 name = "semver" ··· 673 775 674 776 [[package]] 675 777 name = "serde" 676 - version = "1.0.147" 778 + version = "1.0.159" 677 779 source = "registry+https://github.com/rust-lang/crates.io-index" 678 - checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" 780 + checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" 679 781 680 782 [[package]] 681 783 name = "servo-fontconfig" ··· 700 802 701 803 [[package]] 702 804 name = "shlex" 703 - version = "0.1.1" 805 + version = "1.1.0" 704 806 source = "registry+https://github.com/rust-lang/crates.io-index" 705 - checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" 807 + checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" 808 + 809 + [[package]] 810 + name = "stest" 811 + version = "0.0.0" 812 + dependencies = [ 813 + "clap 4.2.0", 814 + ] 706 815 707 816 [[package]] 708 817 name = "strsim" ··· 711 820 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" 712 821 713 822 [[package]] 823 + name = "strsim" 824 + version = "0.10.0" 825 + source = "registry+https://github.com/rust-lang/crates.io-index" 826 + checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" 827 + 828 + [[package]] 714 829 name = "syn" 715 - version = "1.0.103" 830 + version = "1.0.109" 716 831 source = "registry+https://github.com/rust-lang/crates.io-index" 717 - checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" 832 + checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" 833 + dependencies = [ 834 + "proc-macro2", 835 + "quote", 836 + "unicode-ident", 837 + ] 838 + 839 + [[package]] 840 + name = "syn" 841 + version = "2.0.11" 842 + source = "registry+https://github.com/rust-lang/crates.io-index" 843 + checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" 718 844 dependencies = [ 719 845 "proc-macro2", 720 846 "quote", ··· 723 849 724 850 [[package]] 725 851 name = "term" 726 - version = "0.5.2" 852 + version = "0.7.0" 727 853 source = "registry+https://github.com/rust-lang/crates.io-index" 728 - checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" 854 + checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" 729 855 dependencies = [ 730 - "byteorder", 731 - "dirs", 856 + "dirs-next", 857 + "rustversion", 732 858 "winapi", 733 859 ] 734 860 735 861 [[package]] 736 862 name = "termcolor" 737 - version = "1.1.3" 863 + version = "1.2.0" 738 864 source = "registry+https://github.com/rust-lang/crates.io-index" 739 - checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" 865 + checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" 740 866 dependencies = [ 741 867 "winapi-util", 742 868 ] ··· 751 877 ] 752 878 753 879 [[package]] 880 + name = "thiserror" 881 + version = "1.0.40" 882 + source = "registry+https://github.com/rust-lang/crates.io-index" 883 + checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" 884 + dependencies = [ 885 + "thiserror-impl", 886 + ] 887 + 888 + [[package]] 889 + name = "thiserror-impl" 890 + version = "1.0.40" 891 + source = "registry+https://github.com/rust-lang/crates.io-index" 892 + checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" 893 + dependencies = [ 894 + "proc-macro2", 895 + "quote", 896 + "syn 2.0.11", 897 + ] 898 + 899 + [[package]] 754 900 name = "unicode-ident" 755 - version = "1.0.5" 901 + version = "1.0.8" 756 902 source = "registry+https://github.com/rust-lang/crates.io-index" 757 - checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" 903 + checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" 758 904 759 905 [[package]] 760 906 name = "unicode-segmentation" 761 - version = "1.10.0" 907 + version = "1.10.1" 762 908 source = "registry+https://github.com/rust-lang/crates.io-index" 763 - checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" 909 + checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" 764 910 765 911 [[package]] 766 912 name = "unicode-width" ··· 769 915 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" 770 916 771 917 [[package]] 772 - name = "vec_map" 773 - version = "0.8.2" 918 + name = "utf8parse" 919 + version = "0.2.1" 774 920 source = "registry+https://github.com/rust-lang/crates.io-index" 775 - checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" 921 + checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" 776 922 777 923 [[package]] 778 - name = "version_check" 779 - version = "0.9.4" 924 + name = "vec_map" 925 + version = "0.8.2" 780 926 source = "registry+https://github.com/rust-lang/crates.io-index" 781 - checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 927 + checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" 782 928 783 929 [[package]] 784 930 name = "wasi" 785 - version = "0.9.0+wasi-snapshot-preview1" 931 + version = "0.11.0+wasi-snapshot-preview1" 786 932 source = "registry+https://github.com/rust-lang/crates.io-index" 787 - checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" 933 + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" 788 934 789 935 [[package]] 790 936 name = "which" 791 - version = "3.1.1" 937 + version = "4.4.0" 792 938 source = "registry+https://github.com/rust-lang/crates.io-index" 793 - checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" 939 + checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" 794 940 dependencies = [ 941 + "either", 795 942 "libc", 943 + "once_cell", 796 944 ] 797 945 798 946 [[package]] ··· 827 975 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 828 976 829 977 [[package]] 978 + name = "windows-sys" 979 + version = "0.45.0" 980 + source = "registry+https://github.com/rust-lang/crates.io-index" 981 + checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" 982 + dependencies = [ 983 + "windows-targets", 984 + ] 985 + 986 + [[package]] 987 + name = "windows-targets" 988 + version = "0.42.2" 989 + source = "registry+https://github.com/rust-lang/crates.io-index" 990 + checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" 991 + dependencies = [ 992 + "windows_aarch64_gnullvm", 993 + "windows_aarch64_msvc", 994 + "windows_i686_gnu", 995 + "windows_i686_msvc", 996 + "windows_x86_64_gnu", 997 + "windows_x86_64_gnullvm", 998 + "windows_x86_64_msvc", 999 + ] 1000 + 1001 + [[package]] 1002 + name = "windows_aarch64_gnullvm" 1003 + version = "0.42.2" 1004 + source = "registry+https://github.com/rust-lang/crates.io-index" 1005 + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" 1006 + 1007 + [[package]] 1008 + name = "windows_aarch64_msvc" 1009 + version = "0.42.2" 1010 + source = "registry+https://github.com/rust-lang/crates.io-index" 1011 + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" 1012 + 1013 + [[package]] 1014 + name = "windows_i686_gnu" 1015 + version = "0.42.2" 1016 + source = "registry+https://github.com/rust-lang/crates.io-index" 1017 + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" 1018 + 1019 + [[package]] 1020 + name = "windows_i686_msvc" 1021 + version = "0.42.2" 1022 + source = "registry+https://github.com/rust-lang/crates.io-index" 1023 + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" 1024 + 1025 + [[package]] 1026 + name = "windows_x86_64_gnu" 1027 + version = "0.42.2" 1028 + source = "registry+https://github.com/rust-lang/crates.io-index" 1029 + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" 1030 + 1031 + [[package]] 1032 + name = "windows_x86_64_gnullvm" 1033 + version = "0.42.2" 1034 + source = "registry+https://github.com/rust-lang/crates.io-index" 1035 + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" 1036 + 1037 + [[package]] 1038 + name = "windows_x86_64_msvc" 1039 + version = "0.42.2" 1040 + source = "registry+https://github.com/rust-lang/crates.io-index" 1041 + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" 1042 + 1043 + [[package]] 830 1044 name = "x11" 831 - version = "2.20.0" 1045 + version = "2.21.0" 832 1046 source = "registry+https://github.com/rust-lang/crates.io-index" 833 - checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908" 1047 + checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" 834 1048 dependencies = [ 835 1049 "libc", 836 1050 "pkg-config", ··· 860 1074 version = "0.3.5" 861 1075 source = "registry+https://github.com/rust-lang/crates.io-index" 862 1076 checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" 1077 + 1078 + [[package]] 1079 + name = "yaml-rust" 1080 + version = "0.4.5" 1081 + source = "registry+https://github.com/rust-lang/crates.io-index" 1082 + checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" 1083 + dependencies = [ 1084 + "linked-hash-map", 1085 + ]
+15 -16
pkgs/applications/misc/dmenu-rs/default.nix
··· 2 2 , rustPlatform 3 3 , lib 4 4 , fetchFromGitHub 5 + , fetchpatch 5 6 , cargo 6 7 , expat 7 8 , fontconfig ··· 18 19 # See: https://github.com/Shizcow/dmenu-rs#plugins 19 20 stdenv.mkDerivation rec { 20 21 pname = "dmenu-rs"; 21 - version = "5.5.1"; 22 + version = "5.5.2"; 22 23 23 24 src = fetchFromGitHub { 24 25 owner = "Shizcow"; 25 26 repo = pname; 26 27 rev = version; 27 - sha256 = "sha256-WpDqBjIZ5ESnoRtWZmvm+gNTLKqxL4IibRVCj0yRIFM="; 28 + sha256 = "sha256-6yO2S6j/BD6x/bsuTFKAKvARl1n94KRiPwpmswmUOPU="; 28 29 }; 29 30 30 31 nativeBuildInputs = [ ··· 51 52 lockFile = ./Cargo.lock; 52 53 }; 53 54 54 - # The rust-xcb dependency dynamically generates rust code at build time. 55 - # This derivation uses nixpkgs rust functions that vendor each cargo 56 - # dependency's source code into the READ-ONLY nix store. To avoid the code 57 - # generation step failing, we copy the rust-xcb source out of the nix store 58 - # and make it writeable. Also, we remove the build's hardcoded c compiler. 59 - # See: https://github.com/rust-x-bindings/rust-xcb/tree/v0.8.2 55 + # Fix a bug in the makefile when installing. 56 + # See https://github.com/Shizcow/dmenu-rs/pull/50 57 + patches = let 58 + fix-broken-make-install-patch = fetchpatch { 59 + url = "https://github.com/Shizcow/dmenu-rs/commit/1f4b3f8a07d73272f8c6f19bfb6ff3de5e042815.patch"; 60 + sha256 = "sha256-hmXApWg8qngc1vHkHUnB7Lt7wQUOyCSsBmn4HC1j53M="; 61 + }; 62 + in [ 63 + fix-broken-make-install-patch 64 + ]; 65 + 66 + # Copy the Cargo.lock stored here in nixpkgs into the build directory. 60 67 postPatch = '' 61 - substituteInPlace config.mk --replace "clang" "" 62 - 63 - chmod +w "$NIX_BUILD_TOP/cargo-vendor-dir" 64 - mkdir -p "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" 65 - cp -r --no-preserve=mod "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2/." "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" 66 - unlink "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" 67 - mv "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" 68 - 69 68 cp ${./Cargo.lock} src/Cargo.lock 70 69 ''; 71 70