From bd4c1370aea2bb2bd6f4e0a7afb87a6be5751b23 Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@ditigal.xyz>
Date: Fri, 22 Aug 2025 11:42:49 +0200
Subject: [PATCH] feat: use new rust packaging with ruther packages

---
 modules/ruther/packages/rust-crates.scm | 646 ++++++++++++++++++++++++
 modules/ruther/packages/ruther.scm      | 144 +-----
 2 files changed, 654 insertions(+), 136 deletions(-)

diff --git a/modules/ruther/packages/rust-crates.scm b/modules/ruther/packages/rust-crates.scm
index 87116df7dcb61ee423281a8699b38e74af05de6d..702c537b00118479e43b920bbda5e5c0b7ee77aa 100644
--- a/modules/ruther/packages/rust-crates.scm
+++ b/modules/ruther/packages/rust-crates.scm
@@ -72,6 +72,10 @@
   (crate-source "adler" "1.0.2"
                 "1zim79cvzd5yrkzl3nyfx0avijwgk9fqv3yrscdy1cc79ih02qpj"))
 
+(define rust-ahash-0.7.6
+  (crate-source "ahash" "0.7.6"
+                "0isw672fiwx8cjl040jrck6pi85xcszkz6q0xsqkiy6qjl31mdgw"))
+
 (define rust-ahash-0.8.7
   (crate-source "ahash" "0.8.7"
                 "008xw6gigwnf0q01ic4ar2y4dqfnzn3kyys6vd4cvfa3imjakhvp"))
@@ -108,14 +112,26 @@
   (crate-source "ansi_term" "0.12.1"
                 "1ljmkbilxgmhavxvxqa7qvm6f3fjggi7q2l3a72q9x0cxjvrnanm"))
 
+(define rust-anstream-0.3.2
+  (crate-source "anstream" "0.3.2"
+                "0qzinx9c8zfq3xqpxzmlv6nrm3ymccr4n8gffkdmj31p50v4za0c"))
+
 (define rust-anstream-0.6.18
   (crate-source "anstream" "0.6.18"
                 "16sjk4x3ns2c3ya1x28a44kh6p47c7vhk27251i015hik1lm7k4a"))
 
+(define rust-anstream-0.6.4
+  (crate-source "anstream" "0.6.4"
+                "0i2a9390vwhc42c5njz38n56jfwg17v64nqw9232j9gb2sz1xf9a"))
+
 (define rust-anstream-0.6.7
   (crate-source "anstream" "0.6.7"
                 "1fkmc8vh3bwd5mycrkhzclax37yd4j374kdpj0lspyn179dl1ljc"))
 
+(define rust-anstyle-1.0.1
+  (crate-source "anstyle" "1.0.1"
+                "1kff80219d5rvvi407wky2zdlb0naxvbbg005s274pidbxfdlc1s"))
+
 (define rust-anstyle-1.0.10
   (crate-source "anstyle" "1.0.10"
                 "1yai2vppmd7zlvlrp9grwll60knrmscalf8l2qpfz8b7y5lkpk2m"))
@@ -124,6 +140,14 @@
   (crate-source "anstyle" "1.0.4"
                 "11yxw02b6parn29s757z96rgiqbn8qy0fk9a3p3bhczm85dhfybh"))
 
+(define rust-anstyle-parse-0.2.1
+  (crate-source "anstyle-parse" "0.2.1"
+                "0cy38fbdlnmwyy6q8dn8dcfrpycwnpjkljsjqn3kmc40b7zp924k"))
+
+(define rust-anstyle-parse-0.2.2
+  (crate-source "anstyle-parse" "0.2.2"
+                "0h11is6a9pv027yw26ijrqhzrps5kyk3k58xzyk5x3w6q64rlyri"))
+
 (define rust-anstyle-parse-0.2.3
   (crate-source "anstyle-parse" "0.2.3"
                 "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7"))
@@ -132,6 +156,10 @@
   (crate-source "anstyle-parse" "0.2.6"
                 "1acqayy22fwzsrvr6n0lz6a4zvjjcvgr5sm941m7m0b2fr81cb9v"))
 
+(define rust-anstyle-query-1.0.0
+  (crate-source "anstyle-query" "1.0.0"
+                "0js9bgpqz21g0p2nm350cba1d0zfyixsma9lhyycic5sw55iv8aw"))
+
 (define rust-anstyle-query-1.0.2
   (crate-source "anstyle-query" "1.0.2"
                 "0j3na4b1nma39g4x7cwvj009awxckjf3z2vkwhldgka44hqj72g2"))
@@ -140,6 +168,14 @@
   (crate-source "anstyle-query" "1.1.2"
                 "036nm3lkyk43xbps1yql3583fp4hg3b1600is7mcyxs1gzrpm53r"))
 
+(define rust-anstyle-wincon-1.0.1
+  (crate-source "anstyle-wincon" "1.0.1"
+                "12714vwjf4c1wm3qf49m5vmd93qvq2nav6zpjc0bxbh3ayjby2hq"))
+
+(define rust-anstyle-wincon-3.0.1
+  (crate-source "anstyle-wincon" "3.0.1"
+                "0a066gr4p7bha8qwnxyrpbrqzjdvk8l7pdg7isljimpls889ssgh"))
+
 (define rust-anstyle-wincon-3.0.2
   (crate-source "anstyle-wincon" "3.0.2"
                 "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w"))
@@ -180,6 +216,10 @@
   (crate-source "async-stream-impl" "0.3.5"
                 "14q179j4y8p2z1d0ic6aqgy9fhwz8p9cai1ia8kpw4bw7q12mrhn"))
 
+(define rust-async-trait-0.1.71
+  (crate-source "async-trait" "0.1.71"
+                "1grf5p4m1bb79isbb3g4b8w7wpz51sw003a88x69ql2nvlhxar55"))
+
 (define rust-async-trait-0.1.77
   (crate-source "async-trait" "0.1.77"
                 "1adf1jh2yg39rkpmqjqyr9xyd6849p0d95425i6imgbhx0syx069"))
@@ -216,6 +256,10 @@
   (crate-source "bitflags" "1.3.2"
                 "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy"))
 
+(define rust-bitflags-2.3.3
+  (crate-source "bitflags" "2.3.3"
+                "0hifjw3191g3w5cwqqvbx8knrr3zchdwfc3rs6mn11p5si9yf2v3"))
+
 (define rust-bitflags-2.4.1
   (crate-source "bitflags" "2.4.1"
                 "01ryy3kd671b0ll4bhdvhsz67vwz1lz53fz504injrd7wpv64xrj"))
@@ -224,6 +268,10 @@
   (crate-source "bitflags" "2.6.0"
                 "1pkidwzn3hnxlsl8zizh0bncgbjnw7c41cx7bby26ncbzmiznj5h"))
 
+(define rust-block-buffer-0.10.4
+  (crate-source "block-buffer" "0.10.4"
+                "0w9sa2ypmrsqqvc20nhwr75wbb5cjr4kkyhpjm1z1lv2kdicfy1h"))
+
 (define rust-brotli-3.4.0
   (crate-source "brotli" "3.4.0"
                 "03qhcq09a6f8y4gm0bmsn7jrq5804cwpkcx3fyay1g7lgsj78q2i"))
@@ -261,6 +309,10 @@
   (crate-source "bzip2-sys" "0.1.11+1.0.8"
                 "1p2crnv8d8gpz5c2vlvzl0j55i3yqg5bi0kwsl1531x77xgraskk"))
 
+(define rust-cc-1.0.79
+  (crate-source "cc" "1.0.79"
+                "07x93b8zbf3xc2dggdd460xlk1wg8lxm6yflwddxj8b15030klsh"))
+
 (define rust-cc-1.0.83
   (crate-source "cc" "1.0.83"
                 "1l643zidlb5iy1dskc5ggqs4wqa29a02f44piczqc8zcnsq4y5zi"))
@@ -281,26 +333,58 @@
   (crate-source "clap" "2.34.0"
                 "071q5d8jfwbazi6zhik9xwpacx5i6kb2vkzy060vhf0c3120aqd0"))
 
+(define rust-clap-4.3.11
+  (crate-source "clap" "4.3.11"
+                "0pd0chvzszqjczhc407b5b5w7mkybq81nizx721vnzdlgz6fah0n"))
+
 (define rust-clap-4.4.17
   (crate-source "clap" "4.4.17"
                 "0ls2sngyn7fba1dzkhl7k3f4l87kkny5b1nvbqivk69rqc1jx4w0"))
 
+(define rust-clap-4.4.6
+  (crate-source "clap" "4.4.6"
+                "0mmragwn4wqp42ksv67wj9fdq5pj8d5iab4f7vs0gpicdksh8iyh"))
+
 (define rust-clap-4.5.23
   (crate-source "clap" "4.5.23"
                 "110cf0i9fmkfqzqhi1h8za9y0vnr5rwhy3wmv1p0rcgp5vnffd9i"))
 
+(define rust-clap-builder-4.3.11
+  (crate-source "clap_builder" "4.3.11"
+                "0ay701xxriz1blywcw30261xingsq7y7fnpkafdszvi7slw93icq"))
+
 (define rust-clap-builder-4.4.17
   (crate-source "clap_builder" "4.4.17"
                 "1ymqlxpzkh60f3a2lzcjyr91naij4y62jka47v3z3vjrqrcdph6n"))
 
+(define rust-clap-builder-4.4.6
+  (crate-source "clap_builder" "4.4.6"
+                "0iafh05fjzgaldx10j9qik9ir5sqz1mrcdy7lcgbspm6mjp1y8qf"))
+
 (define rust-clap-builder-4.5.23
   (crate-source "clap_builder" "4.5.23"
                 "0f28rgc09kdgfq1hgg1bb1ydaw243w6dwyw74syz439k6b32yn1h"))
 
+(define rust-clap-derive-4.3.2
+  (crate-source "clap_derive" "4.3.2"
+                "0pw2bc8i7cxfrmwpa5wckx3fbw8s019nn7cgkv1yxmlsh4m2pkdq"))
+
+(define rust-clap-derive-4.4.2
+  (crate-source "clap_derive" "4.4.2"
+                "0wxq692izvj0gn4i29002xs8l02wpzx6jwr4z17bhs8dy9ph2qh8"))
+
 (define rust-clap-derive-4.5.18
   (crate-source "clap_derive" "4.5.18"
                 "1ardb26bvcpg72q9myr7yir3a8c83gx7vxk1cccabsd9n73s1ija"))
 
+(define rust-clap-lex-0.5.0
+  (crate-source "clap_lex" "0.5.0"
+                "06vcvpvp65qggc5agbirzqk2di00gxg6vazzc3qlwzkw70qxm9id"))
+
+(define rust-clap-lex-0.5.1
+  (crate-source "clap_lex" "0.5.1"
+                "0qgrlq509vr49wq91jh50f9pm5f8lxmv1rcbklxnsg4nprxcaz6d"))
+
 (define rust-clap-lex-0.6.0
   (crate-source "clap_lex" "0.6.0"
                 "1l8bragdvim7mva9flvd159dskn2bdkpl0jqrr41wnjfn8pcfbvh"))
@@ -317,6 +401,10 @@
   (crate-source "colorchoice" "1.0.3"
                 "1439m3r3jy3xqck8aa13q658visn71ki76qa93cy55wkmalwlqsv"))
 
+(define rust-config-0.13.3
+  (crate-source "config" "0.13.3"
+                "19sjgx88jkx55yqln9z85hfp80a2aj1sipn7qqa1ghmzd1zsyyfk"))
+
 (define rust-convert-case-0.4.0
   (crate-source "convert_case" "0.4.0"
                 "03jaf1wrsyqzcaah9jf8l1iznvdw5mlsca2qghhzr9w27sddaib2"))
@@ -326,6 +414,10 @@
   (crate-source "core-foundation-sys" "0.8.6"
                 "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6"))
 
+(define rust-cpufeatures-0.2.9
+  (crate-source "cpufeatures" "0.2.9"
+                "1wg1vmsx3gd30xkc7h7r6nfx7njx063hqjimgyrb0qj17bzpcyx1"))
+
 (define rust-crc32fast-1.3.2
   (crate-source "crc32fast" "1.3.2"
                 "03c8f29yx293yf43xar946xbls1g60c207m9drf8ilqhr25vsh5m"))
@@ -362,6 +454,10 @@
   (crate-source "crossbeam-utils" "0.8.20"
                 "100fksq5mm1n7zj242cclkw6yf7a4a8ix3lvpfkhxvdhbda9kv12"))
 
+(define rust-crypto-common-0.1.6
+  (crate-source "crypto-common" "0.1.6"
+                "1cvby95a6xg7kxdz5ln3rl9xh66nz66w46mm3g56ri1z5x815yqv"))
+
 (define rust-ctor-0.2.6
   (crate-source "ctor" "0.2.6"
                 "17hrvsrkwzpnz4px1r179bffc2lmiwav159igrvhf5w63rrb7lih"))
@@ -370,14 +466,34 @@
   (crate-source "dactyl" "0.9.0"
                 "0frcj0fl7mjc9fsdfcymp1cfrhyv7w2fqdj7isa7dpmwhasfavxr"))
 
+(define rust-darling-0.14.4
+  (crate-source "darling" "0.14.4"
+                "0l1qrn805bsxa0iy7x8bmdwr8c10hlw0yiqs8ckv7lbz86rhqxbv"))
+
+(define rust-darling-core-0.14.4
+  (crate-source "darling_core" "0.14.4"
+                "1w4b2ndxmkwghwq84yphk8x15jnpivm08w596g12ry5pwsk1r70h"))
+
+(define rust-darling-macro-0.14.4
+  (crate-source "darling_macro" "0.14.4"
+                "13mlyd5w275c815k0ijf6g4c446hs8b3m2h4an5isqgpr7dv9am4"))
+
 (define rust-data-encoding-2.5.0
   (crate-source "data-encoding" "2.5.0"
                 "1rcbnwfmfxhlshzbn3r7srm3azqha3mn33yxyqxkzz2wpqcjm5ky"))
 
+(define rust-dbus-0.9.7
+  (crate-source "dbus" "0.9.7"
+                "06vdv4aarjs4w6byg9nqajr67c8qvlhk3153ic2i65pvp63ikchv"))
+
 (define rust-deflate64-0.1.6
   (crate-source "deflate64" "0.1.6"
                 "1aagh5mmyr8p08if33hizqwiq2as90v9smla89nydq6pivsfy766"))
 
+(define rust-derive-is-enum-variant-0.1.1
+  (crate-source "derive_is_enum_variant" "0.1.1"
+                "15w18649m4h47pdpr04id0wv8br8bg606zvrafcrfijihicqib6h"))
+
 (define rust-derive-more-0.99.17
   (crate-source "derive_more" "0.99.17"
                 "0883jr0gdf9mi8rn7qbz1p0z7hqzfd275pil2gwm66bw1b9i1f2g"))
@@ -390,6 +506,10 @@
   (crate-source "difflib" "0.4.0"
                 "1s7byq4d7jgf2hcp2lcqxi2piqwl8xqlharfbi8kf90n8csy7131"))
 
+(define rust-digest-0.10.7
+  (crate-source "digest" "0.10.7"
+                "14p2n6ih29x81akj097lvz7wi9b6b9hvls0lwrv7b6xwyy0s5ncy"))
+
 (define rust-directories-next-2.0.0
   (crate-source "directories-next" "2.0.0"
                 "1g1vq8d8mv0vp0l317gh9y46ipqg2fxjnbc7lnjhwqbsv4qf37ik"))
@@ -411,6 +531,10 @@
   (crate-source "displaydoc" "0.2.5"
                 "1q0alair462j21iiqwrr21iabkfnb13d6x5w95lkdg21q2xrqdlp"))
 
+(define rust-dlv-list-0.3.0
+  (crate-source "dlv-list" "0.3.0"
+                "0mqj5rdkcjksw3kvjj0nga6rzcpppx0kimjwi527yhifz6kw5206"))
+
 (define rust-doc-comment-0.3.3
   (crate-source "doc-comment" "0.3.3"
                 "043sprsf3wl926zmck1bm7gw0jq50mb76lkpk49vasfr6ax1p97y"))
@@ -443,6 +567,10 @@
   (crate-source "encoding_rs_io" "0.1.7"
                 "10ra4l688cdadd8h1lsbahld1zbywnnqv68366mbhamn3xjwbhqw"))
 
+(define rust-enum-kinds-0.5.1
+  (crate-source "enum-kinds" "0.5.1"
+                "0qnlgzlsydnxsgcf2lkvqsrmdxignjkam1fsnfd4c7b8amls2h2f"))
+
 (define rust-enum-map-2.7.3
   (crate-source "enum-map" "2.7.3"
                 "1sgjgl4mmz93jdkfdsmapc3dmaq8gddagw9s0fd501w2vyzz6rk8"))
@@ -467,6 +595,10 @@
   (crate-source "equivalent" "1.0.1"
                 "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"))
 
+(define rust-errno-0.3.1
+  (crate-source "errno" "0.3.1"
+                "0fp7qy6fwagrnmi45msqnl01vksqwdb2qbbv60n9cz7rf0xfrksb"))
+
 (define rust-errno-0.3.10
   (crate-source "errno" "0.3.10"
                 "0pgblicz1kjz9wa9m0sghkhh2zw1fhq1mxzj7ndjm746kg5m5n1k"))
@@ -475,6 +607,10 @@
   (crate-source "errno" "0.3.8"
                 "0ia28ylfsp36i27g1qih875cyyy4by2grf80ki8vhgh6vinf8n52"))
 
+(define rust-errno-dragonfly-0.1.2
+  (crate-source "errno-dragonfly" "0.1.2"
+                "1grrmcm6q8512hkq5yzch3yv8wafflc2apbmsaabiyk44yqz2s5a"))
+
 (define rust-fallible-iterator-0.3.0
   (crate-source "fallible-iterator" "0.3.0"
                 "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a"))
@@ -515,26 +651,70 @@
   (crate-source "form_urlencoded" "1.2.1"
                 "0milh8x7nl4f450s3ddhg57a3flcv6yq8hlkyk6fyr3mcb128dp1"))
 
+(define rust-from-variants-1.0.2
+  (crate-source "from_variants" "1.0.2"
+                "1wmv85523z261vwmx1iqjykf0dp8fvy9kgjxj0c7cs2p427rr1af"))
+
+(define rust-from-variants-impl-1.0.2
+  (crate-source "from_variants_impl" "1.0.2"
+                "17p6djij0ar0c9dlfnq4dj9bgmq16fcsf3winjr9cv8fm12fd9am"))
+
+(define rust-futures-0.3.28
+  (crate-source "futures" "0.3.28"
+                "0h7c1xvxk751c7xlnph6fh3rb77z4lig4qif7f8q79db2az2ld13"))
+
+(define rust-futures-channel-0.3.28
+  (crate-source "futures-channel" "0.3.28"
+                "1wmm9wm5zjigxz61qkscmxp7c30zp08dy63spjz5pch9gva1hmcm"))
+
+(define rust-futures-core-0.3.28
+  (crate-source "futures-core" "0.3.28"
+                "137fdxy5amg9zkpa1kqnj7bnha6b94fmddz59w973x96gqxmijjb"))
+
 (define rust-futures-core-0.3.30
   (crate-source "futures-core" "0.3.30"
                 "07aslayrn3lbggj54kci0ishmd1pr367fp7iks7adia1p05miinz"))
 
+(define rust-futures-executor-0.3.28
+  (crate-source "futures-executor" "0.3.28"
+                "1q468di96knnla72xdvswic1ir2qkrf5czsdigc5n4l86a1fxv6c"))
+
+(define rust-futures-io-0.3.28
+  (crate-source "futures-io" "0.3.28"
+                "0r4rhkdhq1my4fahlhz59barqa511bylq813w3w4gvbidq4p9zsg"))
+
 (define rust-futures-io-0.3.30
   (crate-source "futures-io" "0.3.30"
                 "1hgh25isvsr4ybibywhr4dpys8mjnscw4wfxxwca70cn1gi26im4"))
 
+(define rust-futures-macro-0.3.28
+  (crate-source "futures-macro" "0.3.28"
+                "0wpfsqxwqk5k569xl0jzz4zxy85x695mndf7y9jn66q6jid59jl9"))
+
 (define rust-futures-macro-0.3.30
   (crate-source "futures-macro" "0.3.30"
                 "1b49qh9d402y8nka4q6wvvj0c88qq91wbr192mdn5h54nzs0qxc7"))
 
+(define rust-futures-sink-0.3.28
+  (crate-source "futures-sink" "0.3.28"
+                "0vkv4frf4c6gm1ag9imjz8d0xvpnn22lkylsls0rffx147zf8fzl"))
+
 (define rust-futures-sink-0.3.30
   (crate-source "futures-sink" "0.3.30"
                 "1dag8xyyaya8n8mh8smx7x6w2dpmafg2din145v973a3hw7f1f4z"))
 
+(define rust-futures-task-0.3.28
+  (crate-source "futures-task" "0.3.28"
+                "0ravgihyarbplj32zp60asirfnaalw2wfsa0afhnl3kcpqrd3lvn"))
+
 (define rust-futures-task-0.3.30
   (crate-source "futures-task" "0.3.30"
                 "013h1724454hj8qczp8vvs10qfiqrxr937qsrv6rhii68ahlzn1q"))
 
+(define rust-futures-util-0.3.28
+  (crate-source "futures-util" "0.3.28"
+                "0cwmls9369w6q6hwlbm10q0plr6hmg8w28fpqvv4rmbjnx01xc16"))
+
 (define rust-futures-util-0.3.30
   (crate-source "futures-util" "0.3.30"
                 "0j0xqhcir1zf2dcbpd421kgw6wvsk0rpxflylcysn1rlp3g02r1x"))
@@ -547,10 +727,18 @@
   (crate-source "generic-array" "0.12.4"
                 "1gfpay78vijl9vrwl1k9v7fbvbhkhcmnrk4kfg9l6x24y4s9zpzz"))
 
+(define rust-generic-array-0.14.7
+  (crate-source "generic-array" "0.14.7"
+                "16lyyrzrljfq424c3n8kfwkqihlimmsg5nhshbbp48np3yjrqr45"))
+
 (define rust-getopts-0.2.21
   (crate-source "getopts" "0.2.21"
                 "1mgb3qvivi26gs6ihqqhh8iyhp3vgxri6vwyrwg28w0xqzavznql"))
 
+(define rust-getrandom-0.2.10
+  (crate-source "getrandom" "0.2.10"
+                "09zlimhhskzf7cmgcszix05wyz2i6fcpvh711cv1klsxl6r3chdy"))
+
 (define rust-getrandom-0.2.12
   (crate-source "getrandom" "0.2.12"
                 "1d8jb9bv38nkwlqqdjcav6gxckgwc9g30pm3qq506rvncpm9400r"))
@@ -559,6 +747,10 @@
   (crate-source "getrandom" "0.2.15"
                 "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4"))
 
+(define rust-gimli-0.28.0
+  (crate-source "gimli" "0.28.0"
+                "1h7hcl3chfvd2gfrrxjymnwj7anqxjslvz20kcargkvsya2dgf3g"))
+
 (define rust-gimli-0.28.1
   (crate-source "gimli" "0.28.1"
                 "0lv23wc8rxvmjia3mcxc6hj9vkqnv1bqq0h8nzjcgf71mrxx6wa2"))
@@ -587,6 +779,10 @@
   (crate-source "heck" "0.3.3"
                 "0b0kkr790p66lvzn9nsmfjvydrbmh9z5gb664jchwgw64vxiwqkd"))
 
+(define rust-heck-0.4.1
+  (crate-source "heck" "0.4.1"
+                "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))
+
 (define rust-heck-0.5.0
   (crate-source "heck" "0.5.0"
                 "1sjmpsdl8czyh9ywl3qcsfsq9a307dg4ni2vnlwgnzzqhc4y0113"))
@@ -595,6 +791,10 @@
   (crate-source "hermit-abi" "0.1.19"
                 "0cxcm8093nf5fyn114w8vxbrbcyvv91d4015rdnlgfll7cs6gd32"))
 
+(define rust-hermit-abi-0.3.2
+  (crate-source "hermit-abi" "0.3.2"
+                "12v66gy77sqrgmjlx01w9p054nvz4mnhbd6xaazkxnddrp448ca4"))
+
 (define rust-hermit-abi-0.3.3
   (crate-source "hermit-abi" "0.3.3"
                 "1dyc8qsjh876n74a3rcz8h43s27nj1sypdhsn2ms61bd3b47wzyp"))
@@ -651,6 +851,10 @@
   (crate-source "icu_provider_macros" "1.5.0"
                 "1mjs0w7fcm2lcqmbakhninzrjwqs485lkps4hz0cv3k36y9rxj0y"))
 
+(define rust-ident-case-1.0.1
+  (crate-source "ident_case" "1.0.1"
+                "0fac21q6pwns8gh1hz3nbq15j8fi441ncl6w4vlnd1cmc55kiq5r"))
+
 (define rust-idna-1.0.3
   (crate-source "idna" "1.0.3"
                 "0zlajvm2k3wy0ay8plr07w22hxkkmrxkffa6ah57ac6nci984vv8"))
@@ -675,6 +879,10 @@
   (crate-source "is-terminal" "0.4.10"
                 "0m9la3f7cs77y85nkbcjsxkb7k861fc6bdhahyfidgh7gljh1b8b"))
 
+(define rust-is-terminal-0.4.9
+  (crate-source "is-terminal" "0.4.9"
+                "12xgvc7nsrp3pn8hcxajfhbli2l5wnh3679y2fmky88nhj4qj26b"))
+
 (define rust-is-terminal-polyfill-1.70.1
   (crate-source "is_terminal_polyfill" "1.70.1"
                 "1kwfgglh91z33kl0w5i338mfpa3zs0hidq5j4ny4rmjwrikchhvr"))
@@ -691,6 +899,14 @@
   (crate-source "itoa" "1.0.14"
                 "0x26kr9m062mafaxgcf2p6h2x7cmixm0zw95aipzn2hr3d5jlnnp"))
 
+(define rust-itoa-1.0.8
+  (crate-source "itoa" "1.0.8"
+                "0jig0fmn7bdqpb1jz3ibnlw6gdm31wyn510x0k9mninch59jmc32"))
+
+(define rust-itoa-1.0.9
+  (crate-source "itoa" "1.0.9"
+                "0f6cpb4yqzhkrhhg6kqsw3wnmmhdnnffi6r2xzy248gzi2v0l5dg"))
+
 (define rust-jobserver-0.1.27
   (crate-source "jobserver" "0.1.27"
                 "0z9w6vfqwbr6hfk9yaw7kydlh6f7k39xdlszxlh39in4acwzcdwc"))
@@ -704,10 +920,22 @@
   (crate-source "json_comments" "0.2.2"
                 "0191qf6gaw3bcv13kx9xzwbfx71jv7gly5ds2l77bacvwpagxfwx"))
 
+(define rust-json5-0.4.1
+  (crate-source "json5" "0.4.1"
+                "1h9hni897zmn3vcixfbwwkj2gkz27h7z9dah8bk1qv37mwhxpc4n"))
+
 (define rust-lazy-static-1.4.0
   (crate-source "lazy_static" "1.4.0"
                 "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2"))
 
+(define rust-libc-0.2.147
+  (crate-source "libc" "0.2.147"
+                "1cwv2lkzk3p5lby79fm42qhsh29lvbqwayhjjkq1s746xaq8yrml"))
+
+(define rust-libc-0.2.149
+  (crate-source "libc" "0.2.149"
+                "16z2zqswcbk1qg5yigfyr0d44v0974amdaj564dmv5dpi2y770d0"))
+
 (define rust-libc-0.2.152
   (crate-source "libc" "0.2.152"
                 "1rsnma7hnw22w7jh9yqg43slddvfbnfzrvm3s7s4kinbj1jvzqqk"))
@@ -716,6 +944,11 @@
   (crate-source "libc" "0.2.167"
                 "1z06pa4y2x2arwm7si12xsaf1cj46l9pazzrvwbsh5a320p5imh9"))
 
+(define rust-libdbus-sys-0.2.5
+  ;; TODO: Check bundled sources.
+  (crate-source "libdbus-sys" "0.2.5"
+                "0wjw93q6ckrn8qdrxzdi02f0ma9g7nnlpgkrkcll1mjhnw95a206"))
+
 (define rust-libredox-0.0.1
   (crate-source "libredox" "0.0.1"
                 "1s2fh4ikpp9xl0lsl01pi0n8pw1q9s3ld452vd8qh1v63v537j45"))
@@ -729,6 +962,10 @@
   (crate-source "libsqlite3-sys" "0.27.0"
                 "05pp60ncrmyjlxxjj187808jkvpxm06w5lvvdwwvxd2qrmnj4kng"))
 
+(define rust-linked-hash-map-0.5.6
+  (crate-source "linked-hash-map" "0.5.6"
+                "03vpgw7x507g524nx5i1jf5dl8k3kv0fzg8v3ip6qqwbpkqww5q7"))
+
 (define rust-linux-raw-sys-0.4.12
   ;; TODO: Check bundled sources.
   (crate-source "linux-raw-sys" "0.4.12"
@@ -739,6 +976,11 @@
   (crate-source "linux-raw-sys" "0.4.14"
                 "12gsjgbhhjwywpqcrizv80vrp7p7grsz5laqq773i33wphjsxcvq"))
 
+(define rust-linux-raw-sys-0.4.3
+  ;; TODO: Check bundled sources.
+  (crate-source "linux-raw-sys" "0.4.3"
+                "1w6kxhk91ncwjfrggd1xxkifc8ym69nvvqwk9h29zjqjrb921z09"))
+
 (define rust-litemap-0.7.4
   (crate-source "litemap" "0.7.4"
                 "012ili3vppd4952sh6y3qwcd0jkd0bq2qpr9h7cppc8sj11k7saf"))
@@ -776,6 +1018,14 @@
   (crate-source "mailparse" "0.14.0"
                 "1al0yb9wgy26ihd0gm4x1dk9rsv23wrmp2qw1lk4f04cbw7mfmkb"))
 
+(define rust-memchr-2.5.0
+  (crate-source "memchr" "2.5.0"
+                "0vanfk5mzs1g1syqnj03q8n0syggnhn55dq535h2wxr7rwpfbzrd"))
+
+(define rust-memchr-2.6.4
+  (crate-source "memchr" "2.6.4"
+                "0rq1ka8790ns41j147npvxcqcl2anxyngsdimy85ag2api0fwrgn"))
+
 (define rust-memchr-2.7.1
   (crate-source "memchr" "2.7.1"
                 "0jf1kicqa4vs9lyzj4v4y1p90q0dh87hvhsdd5xvhnp527sw8gaj"))
@@ -800,6 +1050,14 @@
   (crate-source "mio" "0.8.10"
                 "02gyaxvaia9zzi4drrw59k9s0j6pa5d1y2kv7iplwjipdqlhngcg"))
 
+(define rust-mio-0.8.8
+  (crate-source "mio" "0.8.8"
+                "1lhrdgcmcy8f0qy1n7357q0aprfkm5gld5mjcrp209pwsdf7cylj"))
+
+(define rust-mpris-2.0.1
+  (crate-source "mpris" "2.0.1"
+                "1svzblilq3kxgra63axl3wibsnl9g8p6b8q1x401wsw2lxazkkjm"))
+
 (define rust-nom-7.1.3
   (crate-source "nom" "7.1.3"
                 "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"))
@@ -840,10 +1098,18 @@
   (crate-source "num-traits" "0.2.19"
                 "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787"))
 
+(define rust-object-0.32.1
+  (crate-source "object" "0.32.1"
+                "1c02x4kvqpnl3wn7gz9idm4jrbirbycyqjgiw6lm1g9k77fzkxcw"))
+
 (define rust-object-0.32.2
   (crate-source "object" "0.32.2"
                 "0hc4cjwyngiy6k51hlzrlsxgv5z25vv7c2cp0ky1lckfic0259m6"))
 
+(define rust-once-cell-1.18.0
+  (crate-source "once_cell" "1.18.0"
+                "0vapcd5ambwck95wyz3ymlim35jirgnqn9a0qmi19msymv95v2yx"))
+
 (define rust-once-cell-1.19.0
   (crate-source "once_cell" "1.19.0"
                 "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"))
@@ -856,6 +1122,10 @@
   (crate-source "option-ext" "0.2.0"
                 "0zbf7cx8ib99frnlanpyikm1bx8qn8x602sw1n7bg6p9x94lyx04"))
 
+(define rust-ordered-multimap-0.4.3
+  (crate-source "ordered-multimap" "0.4.3"
+                "0jljv1257pfyf855jlwwas5mqkzk40b9lqfx40f73qbpf7ildmyc"))
+
 (define rust-pad-0.1.6
   (crate-source "pad" "0.1.6"
                 "1qy0r26r52gp034fv252mmg0s599a55h9nr4xswy04hvky49pbfj"))
@@ -884,10 +1154,30 @@
   (crate-source "path-clean" "1.0.1"
                 "1vzwcrlz39rd94l89rppvkbsn7dvng449f1bnkyk3ayp43y9ld8p"))
 
+(define rust-pathdiff-0.2.1
+  (crate-source "pathdiff" "0.2.1"
+                "1pa4dcmb7lwir4himg1mnl97a05b2z0svczg62l8940pbim12dc8"))
+
 (define rust-percent-encoding-2.3.1
   (crate-source "percent-encoding" "2.3.1"
                 "0gi8wgx0dcy8rnv1kywdv98lwcx67hz0a0zwpib5v2i08r88y573"))
 
+(define rust-pest-2.7.0
+  (crate-source "pest" "2.7.0"
+                "1j9z793syj4jnn0269d0hv4ap97735xm71h12dzvyajyspj3afgp"))
+
+(define rust-pest-derive-2.7.0
+  (crate-source "pest_derive" "2.7.0"
+                "0azzpyakmv4v07zk3jjkcqr9q843xsji3fpgl3sys3pspg4j7xmf"))
+
+(define rust-pest-generator-2.7.0
+  (crate-source "pest_generator" "2.7.0"
+                "146120jhvj5c0fqv0yhb5pdy185nvvi53zjzqmzxmfi2xjjcps5k"))
+
+(define rust-pest-meta-2.7.0
+  (crate-source "pest_meta" "2.7.0"
+                "180cxbbq4amfa0zdn1gw6c76c54yj13bj56z691bk2xx835p27x0"))
+
 (define rust-petgraph-0.6.4
   (crate-source "petgraph" "0.6.4"
                 "1ac6wfq5f5pzcv0nvzzfgjbwg2kwslpnzsw5wcmxlscfcb9azlz1"))
@@ -912,6 +1202,10 @@
   (crate-source "pinned_vec" "0.1.1"
                 "12il2y234k9r4i3v9yh7qpavrwdhi48b057z96hb0bv2j8nxi2i6"))
 
+(define rust-pkg-config-0.3.27
+  (crate-source "pkg-config" "0.3.27"
+                "0r39ryh1magcq4cz5g9x88jllsnxnhcqr753islvyk4jp9h2h1r6"))
+
 (define rust-pkg-config-0.3.28
   (crate-source "pkg-config" "0.3.28"
                 "16kgffwncx5hsppsdf54z6jnjkhwywqy601cxk3rqncyi9zmilv9"))
@@ -948,6 +1242,14 @@
   (crate-source "proc-macro-error-attr" "1.0.4"
                 "0sgq6m5jfmasmwwy8x4mjygx5l7kp8s4j60bv25ckv2j1qc41gm1"))
 
+(define rust-proc-macro2-1.0.64
+  (crate-source "proc-macro2" "1.0.64"
+                "1nm7qw54jn9n0g1ygkw4f63vj90m241yih6ph3g6zx7irdi3p03q"))
+
+(define rust-proc-macro2-1.0.68
+  (crate-source "proc-macro2" "1.0.68"
+                "0p001ki7dbfbv295rxs91d6rhmpg3kwc1jlcv5nyqqlnq3z0c4av"))
+
 (define rust-proc-macro2-1.0.76
   (crate-source "proc-macro2" "1.0.76"
                 "136cp0fgl6rg5ljm3b1xpc0bn0lyvagzzmxvbxgk5hxml36mdz4m"))
@@ -956,6 +1258,18 @@
   (crate-source "proc-macro2" "1.0.92"
                 "1c1vjy5wg8iy7kxsxda564qf4ljp0asysmbn2i7caj177x5m9lrp"))
 
+(define rust-quote-0.3.15
+  (crate-source "quote" "0.3.15"
+                "0yhnnix4dzsv8y4wwz4csbnqjfh73al33j35msr10py6cl5r4vks"))
+
+(define rust-quote-1.0.29
+  (crate-source "quote" "1.0.29"
+                "019ij5fwp56ydww6zr46dhmzsf078qkdq9vz6mw1cri7mgl1ac2p"))
+
+(define rust-quote-1.0.33
+  (crate-source "quote" "1.0.33"
+                "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj"))
+
 (define rust-quote-1.0.35
   (crate-source "quote" "1.0.35"
                 "1vv8r2ncaz4pqdr78x7f138ka595sp2ncr1sa2plm4zxbsmwj7i9"))
@@ -1020,10 +1334,18 @@
   (crate-source "regex-syntax" "0.8.5"
                 "0p41p3hj9ww7blnbwbj9h7rwxzxg0c1hvrdycgys8rxyhqqw859b"))
 
+(define rust-ron-0.7.1
+  (crate-source "ron" "0.7.1"
+                "06iz51r6pyi197jjpfddq8h8884y85myaswfan07cnqylqwkj1w8"))
+
 (define rust-rusqlite-0.30.0
   (crate-source "rusqlite" "0.30.0"
                 "0kgjk7h53wp8k2di2j83ivf50f0bk6rg7bq8j36ygxb42lb4d057"))
 
+(define rust-rust-ini-0.18.0
+  (crate-source "rust-ini" "0.18.0"
+                "1px22l3m84v7f46pa3p4bsjykivw8ryq6af8kpkzdd16c11z5mgn"))
+
 (define rust-rustc-demangle-0.1.23
   (crate-source "rustc-demangle" "0.1.23"
                 "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn"))
@@ -1032,6 +1354,10 @@
   (crate-source "rustc_version" "0.4.0"
                 "0rpk9rcdk405xhbmgclsh4pai0svn49x35aggl4nhbkd4a2zb85z"))
 
+(define rust-rustix-0.38.3
+  (crate-source "rustix" "0.38.3"
+                "1d3mzkj568zxrwdx8mmpnpbkr1ci4prjhw6di2b0cj3mzqgglpxc"))
+
 (define rust-rustix-0.38.30
   (crate-source "rustix" "0.38.30"
                 "1jkb6bzrj2w9ffy35aw4q04mqk1yxqw35fz80x0c4cxgi9c988rj"))
@@ -1044,6 +1370,14 @@
   (crate-source "rustversion" "1.0.18"
                 "0j2207vmgrcxwwwvknfn3lwv4i8djhjnxlvwdnz8bwijqqmrz08f"))
 
+(define rust-ryu-1.0.14
+  (crate-source "ryu" "1.0.14"
+                "1s9ag0xnvahv3nv8bb22xa03gmhq27klw612gdwxxj78dggjn8zy"))
+
+(define rust-ryu-1.0.15
+  (crate-source "ryu" "1.0.15"
+                "0hfphpn1xnpzxwj8qg916ga1lyc33lc03lnf1gb3wwpglj6wrm0s"))
+
 (define rust-ryu-1.0.16
   (crate-source "ryu" "1.0.16"
                 "0k7b90xr48ag5bzmfjp82rljasw2fx28xr3bg1lrpx7b5sljm3gr"))
@@ -1068,6 +1402,14 @@
   (crate-source "semver" "1.0.21"
                 "1c49snqlfcx93xym1cgwx8zcspmyyxm37xa2fyfgjx1vhalxfzmr"))
 
+(define rust-serde-1.0.169
+  (crate-source "serde" "1.0.169"
+                "1c14k1nqpfydqfxaxx8pj4z16gfi9byx0bf1wqqxa04mizdw6ldx"))
+
+(define rust-serde-1.0.188
+  (crate-source "serde" "1.0.188"
+                "17jlqzfhimsk8w37ifjwnm86nwjzawlbgwmwc7nhwdwslv5hz7ng"))
+
 (define rust-serde-1.0.195
   (crate-source "serde" "1.0.195"
                 "00kbc86kgaihpza0zdglcd2qq5468yg0dvvdmkli2y660bs1s9k3"))
@@ -1076,6 +1418,14 @@
   (crate-source "serde" "1.0.215"
                 "13xqkw93cw9rnbkm0zy1apnilzq7l2xf1qw8m1nkga8i1fnw24v5"))
 
+(define rust-serde-derive-1.0.169
+  (crate-source "serde_derive" "1.0.169"
+                "1zblx80lq3k3rr01whx1z0m35i1yybaz60gdqdrani6rl3z8qwr7"))
+
+(define rust-serde-derive-1.0.188
+  (crate-source "serde_derive" "1.0.188"
+                "1wjaclvsfxgqnnnykllvb5gffsxynk66x6h4c1ds6anq8b37mjjf"))
+
 (define rust-serde-derive-1.0.195
   (crate-source "serde_derive" "1.0.195"
                 "0b7ag1qm9q3fgwlmyk2ap5gjbqa9vyf2wfmj4xish6yq0f38zzj6"))
@@ -1088,6 +1438,14 @@
   (crate-source "serde_derive_internals" "0.26.0"
                 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5"))
 
+(define rust-serde-json-1.0.100
+  (crate-source "serde_json" "1.0.100"
+                "0p0qnmhdkqd676m8xbh0lqlphlgqbgmwkgdxg15lrap7kgl187hg"))
+
+(define rust-serde-json-1.0.107
+  (crate-source "serde_json" "1.0.107"
+                "0r8cyb8nh3afb15yfscp1h8sdjfv6pnnwg14kcp8igfqwgk0qhkb"))
+
 (define rust-serde-json-1.0.111
   (crate-source "serde_json" "1.0.111"
                 "1x441azvvdy6x8am4bvkxhswhzw5cr8ml0cqspnihvri8bx4cvhp"))
@@ -1104,6 +1462,10 @@
   (crate-source "serde_spanned" "0.6.8"
                 "1q89g70azwi4ybilz5jb8prfpa575165lmrffd49vmcf76qpqq47"))
 
+(define rust-sha2-0.10.7
+  (crate-source "sha2" "0.10.7"
+                "1n3flx8bjyblmb2n860g8402z7q10caajp2n403n37i3cbcbk7s7"))
+
 (define rust-signal-hook-registry-1.4.1
   (crate-source "signal-hook-registry" "1.4.1"
                 "18crkkw5k82bvcx088xlf5g4n3772m24qhzgfan80nda7d3rn8nq"))
@@ -1124,6 +1486,10 @@
   (crate-source "smallvec" "1.13.2"
                 "0rsw5samawl3wsw6glrsb127rx6sh89a8wyikicw6dkdcjd1lpiw"))
 
+(define rust-socket2-0.5.4
+  (crate-source "socket2" "0.5.4"
+                "17lqx8w2b3nysrkdbdz8y7fkikz5v77c052q57lxwajmxchfhca0"))
+
 (define rust-socket2-0.5.5
   (crate-source "socket2" "0.5.5"
                 "1sgq315f1njky114ip7wcy83qlphv9qclprfjwvxcpfblmcsqpvv"))
@@ -1164,10 +1530,22 @@
   (crate-source "subst" "0.3.5"
                 "07036gcmfrhizj6xswarrziqddn9bwhgwq9s6dkci6q1znj1ng3s"))
 
+(define rust-syn-0.11.11
+  (crate-source "syn" "0.11.11"
+                "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k"))
+
 (define rust-syn-1.0.109
   (crate-source "syn" "1.0.109"
                 "0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj"))
 
+(define rust-syn-2.0.24
+  (crate-source "syn" "2.0.24"
+                "005cd1gzbn98x088y7cck7sim9x9hqd9f77r13wmzhr3d9qszk1n"))
+
+(define rust-syn-2.0.38
+  (crate-source "syn" "2.0.38"
+                "12s06bi068scc4fpv2x2bp3lx2vxnk4s0qv3w9hqznrpl6m7jsz9"))
+
 (define rust-syn-2.0.48
   (crate-source "syn" "2.0.48"
                 "0gqgfygmrxmp8q32lia9p294kdd501ybn6kn2h4gqza0irik2d8g"))
@@ -1176,6 +1554,10 @@
   (crate-source "syn" "2.0.90"
                 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))
 
+(define rust-synom-0.11.3
+  (crate-source "synom" "0.11.3"
+                "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3"))
+
 (define rust-synstructure-0.13.1
   (crate-source "synstructure" "0.13.1"
                 "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8"))
@@ -1204,6 +1586,14 @@
   (crate-source "textwrap" "0.11.0"
                 "0q5hky03ik3y50s9sz25r438bc4nwhqc6dqwynv4wylc807n29nk"))
 
+(define rust-thiserror-1.0.43
+  (crate-source "thiserror" "1.0.43"
+                "0hlcsnjb0rgkqb8imiv86i7jcmad9l14zpx6iwsclhqijywcapx3"))
+
+(define rust-thiserror-1.0.49
+  (crate-source "thiserror" "1.0.49"
+                "1m3yalbcx89bx397igc1ckypw8hiwq9jbzc56pgazrzdsz3fhxqi"))
+
 (define rust-thiserror-1.0.56
   (crate-source "thiserror" "1.0.56"
                 "1b9hnzngjan4d89zjs16i01bcpcnvdwklyh73lj16xk28p37hhym"))
@@ -1212,6 +1602,14 @@
   (crate-source "thiserror" "1.0.69"
                 "0lizjay08agcr5hs9yfzzj6axs53a2rgx070a1dsi3jpkcrzbamn"))
 
+(define rust-thiserror-impl-1.0.43
+  (crate-source "thiserror-impl" "1.0.43"
+                "13qyfz23vq6dydg1jazw6bg5i86zsj6wwdvmg0kv7lwkg4ny2gs6"))
+
+(define rust-thiserror-impl-1.0.49
+  (crate-source "thiserror-impl" "1.0.49"
+                "1k643ga9sbqpcb873n299n3zjzc4srfakyv98xwqi4ly0412yw8h"))
+
 (define rust-thiserror-impl-1.0.56
   (crate-source "thiserror-impl" "1.0.56"
                 "0w9ldp8fa574ilz4dn7y7scpcq66vdjy59qal8qdpwsh7faal3zs"))
@@ -1228,10 +1626,18 @@
   (crate-source "tinystr" "0.7.6"
                 "0bxqaw7z8r2kzngxlzlgvld1r6jbnwyylyvyjbv1q71rvgaga5wi"))
 
+(define rust-tokio-1.32.0
+  (crate-source "tokio" "1.32.0"
+                "1yck1349q23l22bgxcbqd3wkaffw2vmkf7z26m3wgmkcxmvn1v8p"))
+
 (define rust-tokio-1.35.1
   (crate-source "tokio" "1.35.1"
                 "01613rkziqp812a288ga65aqygs254wgajdi57v8brivjkx4x6y8"))
 
+(define rust-tokio-macros-2.1.0
+  (crate-source "tokio-macros" "2.1.0"
+                "0pk7y9dfanab886iaqwcbri39jkw33kgl7y07v0kg1pp8prdq2v3"))
+
 (define rust-tokio-macros-2.2.0
   (crate-source "tokio-macros" "2.2.0"
                 "0fwjy4vdx1h9pi4g2nml72wi0fr27b5m954p13ji9anyy8l1x2jv"))
@@ -1261,6 +1667,14 @@
   (crate-source "tokio-util" "0.7.10"
                 "058y6x4mf0fsqji9rfyb77qbfyc50y4pk2spqgj6xsyr693z66al"))
 
+(define rust-tokio-util-0.7.9
+  (crate-source "tokio-util" "0.7.9"
+                "03d63ivnd8pwi6qzrlw0gyqkiawq5vmkb5sdb4hhnypm4130fs0x"))
+
+(define rust-toml-0.5.11
+  (crate-source "toml" "0.5.11"
+                "0d2266nx8b3n22c7k24x4428z6di8n83a9n466jm7a2hipfz1xzl"))
+
 (define rust-toml-0.8.19
   (crate-source "toml" "0.8.19"
                 "0knjd3mkxyb87qcs2dark3qkpadidap3frqfj5nqvhpxwfc1zvd1"))
@@ -1273,10 +1687,18 @@
   (crate-source "toml_edit" "0.22.22"
                 "1xf7sxfzmnc45f75x302qrn5aph52vc8w226v59yhrm211i8vr2a"))
 
+(define rust-tracing-0.1.37
+  (crate-source "tracing" "0.1.37"
+                "1f2fylc79xmbh7v53kak6qyw27njbx227rd64kb4bga8ilxc7s4c"))
+
 (define rust-tracing-0.1.40
   (crate-source "tracing" "0.1.40"
                 "1vv48dac9zgj9650pg2b4d0j3w6f3x9gbggf43scq5hrlysklln3"))
 
+(define rust-tracing-core-0.1.31
+  (crate-source "tracing-core" "0.1.31"
+                "16pp28izw9c41m7c55qsghlz07r9ark8lzd3x6ig3xhxg89vhm89"))
+
 (define rust-tracing-core-0.1.32
   (crate-source "tracing-core" "0.1.32"
                 "0m5aglin3cdwxpvbg6kz0r9r0k31j48n0kcfwsp6l49z26k3svf0"))
@@ -1285,10 +1707,22 @@
   (crate-source "tree_magic_mini" "3.0.3"
                 "0vdazv3y1iggriwx5ksin72c2ds0xjdhx1yvmd5nxkya0w3gvbci"))
 
+(define rust-typenum-1.16.0
+  (crate-source "typenum" "1.16.0"
+                "1fhb9iaqyjn4dzn2vl86kxjhp4xpw5gynczlnqzf4x6rjgpn2ya9"))
+
 (define rust-typenum-1.17.0
   (crate-source "typenum" "1.17.0"
                 "09dqxv69m9lj9zvv6xw5vxaqx15ps0vxyy5myg33i0kbqvq0pzs2"))
 
+(define rust-ucd-trie-0.1.6
+  (crate-source "ucd-trie" "0.1.6"
+                "1ff4yfksirqs37ybin9aw71aa5gva00hw7jdxbw8w668zy964r7d"))
+
+(define rust-unicode-ident-1.0.10
+  (crate-source "unicode-ident" "1.0.10"
+                "0wvfzc0m3a50xikzfzwj8nh6ls0njngl7z60d2hli1x6yhcrl112"))
+
 (define rust-unicode-ident-1.0.12
   (crate-source "unicode-ident" "1.0.12"
                 "0jzf1znfpb2gx8nr8mvmyqs1crnv79l57nxnbiszc7xf7ynbjm1k"))
@@ -1313,6 +1747,10 @@
   (crate-source "unicode-width" "0.2.0"
                 "1zd0r5vs52ifxn25rs06gxrgz8cmh4xpra922k0xlmrchib1kj0z"))
 
+(define rust-unicode-xid-0.0.4
+  (crate-source "unicode-xid" "0.0.4"
+                "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc"))
+
 (define rust-url-2.5.4
   (crate-source "url" "2.5.4"
                 "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j"))
@@ -1389,6 +1827,10 @@
   (crate-source "winapi-x86_64-pc-windows-gnu" "0.4.0"
                 "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"))
 
+(define rust-windows-aarch64-gnullvm-0.48.0
+  (crate-source "windows_aarch64_gnullvm" "0.48.0"
+                "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli"))
+
 (define rust-windows-aarch64-gnullvm-0.48.5
   (crate-source "windows_aarch64_gnullvm" "0.48.5"
                 "1n05v7qblg1ci3i567inc7xrkmywczxrs1z3lj3rkkxw18py6f1b"))
@@ -1401,6 +1843,10 @@
   (crate-source "windows_aarch64_gnullvm" "0.52.6"
                 "1lrcq38cr2arvmz19v32qaggvj8bh1640mdm9c2fr877h0hn591j"))
 
+(define rust-windows-aarch64-msvc-0.48.0
+  (crate-source "windows_aarch64_msvc" "0.48.0"
+                "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj"))
+
 (define rust-windows-aarch64-msvc-0.48.5
   (crate-source "windows_aarch64_msvc" "0.48.5"
                 "1g5l4ry968p73g6bg6jgyvy9lb8fyhcs54067yzxpcpkf44k2dfw"))
@@ -1417,6 +1863,10 @@
   (crate-source "windows-core" "0.52.0"
                 "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark"))
 
+(define rust-windows-i686-gnu-0.48.0
+  (crate-source "windows_i686_gnu" "0.48.0"
+                "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2"))
+
 (define rust-windows-i686-gnu-0.48.5
   (crate-source "windows_i686_gnu" "0.48.5"
                 "0gklnglwd9ilqx7ac3cn8hbhkraqisd0n83jxzf9837nvvkiand7"))
@@ -1433,6 +1883,10 @@
   (crate-source "windows_i686_gnullvm" "0.52.6"
                 "0rpdx1537mw6slcpqa0rm3qixmsb79nbhqy5fsm3q2q9ik9m5vhf"))
 
+(define rust-windows-i686-msvc-0.48.0
+  (crate-source "windows_i686_msvc" "0.48.0"
+                "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5"))
+
 (define rust-windows-i686-msvc-0.48.5
   (crate-source "windows_i686_msvc" "0.48.5"
                 "01m4rik437dl9rdf0ndnm2syh10hizvq0dajdkv2fjqcywrw4mcg"))
@@ -1460,6 +1914,10 @@
   (crate-source "windows-sys" "0.59.0"
                 "0fw5672ziw8b3zpmnbp9pdv1famk74f1l9fcbc3zsrzdg56vqf0y"))
 
+(define rust-windows-targets-0.48.1
+  (crate-source "windows-targets" "0.48.1"
+                "0pz9ad4mpp06h80hkmzlib78b5r9db7isycy1gr9j17pj1sb3m05"))
+
 (define rust-windows-targets-0.48.5
   (crate-source "windows-targets" "0.48.5"
                 "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws"))
@@ -1472,6 +1930,10 @@
   (crate-source "windows-targets" "0.52.6"
                 "0wwrx625nwlfp7k93r2rra568gad1mwd888h1jwnl0vfg5r4ywlv"))
 
+(define rust-windows-x86-64-gnu-0.48.0
+  (crate-source "windows_x86_64_gnu" "0.48.0"
+                "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya"))
+
 (define rust-windows-x86-64-gnu-0.48.5
   (crate-source "windows_x86_64_gnu" "0.48.5"
                 "13kiqqcvz2vnyxzydjh73hwgigsdr2z1xpzx313kxll34nyhmm2k"))
@@ -1484,6 +1946,10 @@
   (crate-source "windows_x86_64_gnu" "0.52.6"
                 "0y0sifqcb56a56mvn7xjgs8g43p33mfqkd8wj1yhrgxzma05qyhl"))
 
+(define rust-windows-x86-64-gnullvm-0.48.0
+  (crate-source "windows_x86_64_gnullvm" "0.48.0"
+                "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq"))
+
 (define rust-windows-x86-64-gnullvm-0.48.5
   (crate-source "windows_x86_64_gnullvm" "0.48.5"
                 "1k24810wfbgz8k48c2yknqjmiigmql6kk3knmddkv8k8g1v54yqb"))
@@ -1496,6 +1962,10 @@
   (crate-source "windows_x86_64_gnullvm" "0.52.6"
                 "03gda7zjx1qh8k9nnlgb7m3w3s1xkysg55hkd1wjch8pqhyv5m94"))
 
+(define rust-windows-x86-64-msvc-0.48.0
+  (crate-source "windows_x86_64_msvc" "0.48.0"
+                "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s"))
+
 (define rust-windows-x86-64-msvc-0.48.5
   (crate-source "windows_x86_64_msvc" "0.48.5"
                 "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d"))
@@ -1528,6 +1998,10 @@
   (crate-source "xz2" "0.1.7"
                 "1qk7nzpblizvayyq4xzi4b0zacmmbqr6vb9fc0v1avyp17f4931q"))
 
+(define rust-yaml-rust-0.4.5
+  (crate-source "yaml-rust" "0.4.5"
+                "118wbqrr4n6wgk5rjjnlrdlahawlxc1bdsx146mwk8f79in97han"))
+
 (define rust-yansi-0.5.1
   (crate-source "yansi" "0.5.1"
                 "1v4qljgzh73knr7291cgwrf56zrvhmpn837n5n5pypzq1kciq109"))
@@ -1596,6 +2070,99 @@
 ;;; Cargo inputs.
 ;;;
 (define-cargo-inputs lookup-cargo-inputs
+                     (mpris-ctl =>
+                                (list rust-addr2line-0.21.0
+                                      rust-adler-1.0.2
+                                      rust-anstream-0.6.4
+                                      rust-anstyle-1.0.4
+                                      rust-anstyle-parse-0.2.2
+                                      rust-anstyle-query-1.0.0
+                                      rust-anstyle-wincon-3.0.1
+                                      rust-autocfg-1.1.0
+                                      rust-backtrace-0.3.69
+                                      rust-bytes-1.5.0
+                                      rust-cc-1.0.83
+                                      rust-cfg-if-1.0.0
+                                      rust-clap-4.4.6
+                                      rust-clap-builder-4.4.6
+                                      rust-clap-derive-4.4.2
+                                      rust-clap-lex-0.5.1
+                                      rust-colorchoice-1.0.0
+                                      rust-darling-0.14.4
+                                      rust-darling-core-0.14.4
+                                      rust-darling-macro-0.14.4
+                                      rust-dbus-0.9.7
+                                      rust-derive-is-enum-variant-0.1.1
+                                      rust-enum-kinds-0.5.1
+                                      rust-fnv-1.0.7
+                                      rust-from-variants-1.0.2
+                                      rust-from-variants-impl-1.0.2
+                                      rust-futures-0.3.28
+                                      rust-futures-channel-0.3.28
+                                      rust-futures-core-0.3.28
+                                      rust-futures-executor-0.3.28
+                                      rust-futures-io-0.3.28
+                                      rust-futures-macro-0.3.28
+                                      rust-futures-sink-0.3.28
+                                      rust-futures-task-0.3.28
+                                      rust-futures-util-0.3.28
+                                      rust-gimli-0.28.0
+                                      rust-heck-0.3.3
+                                      rust-heck-0.4.1
+                                      rust-hermit-abi-0.3.3
+                                      rust-ident-case-1.0.1
+                                      rust-itoa-1.0.9
+                                      rust-libc-0.2.149
+                                      rust-libdbus-sys-0.2.5
+                                      rust-memchr-2.6.4
+                                      rust-miniz-oxide-0.7.1
+                                      rust-mio-0.8.8
+                                      rust-mpris-2.0.1
+                                      rust-num-cpus-1.16.0
+                                      rust-object-0.32.1
+                                      rust-once-cell-1.18.0
+                                      rust-pin-project-lite-0.2.13
+                                      rust-pin-utils-0.1.0
+                                      rust-pkg-config-0.3.27
+                                      rust-proc-macro2-1.0.68
+                                      rust-quote-0.3.15
+                                      rust-quote-1.0.33
+                                      rust-rustc-demangle-0.1.23
+                                      rust-ryu-1.0.15
+                                      rust-serde-1.0.188
+                                      rust-serde-derive-1.0.188
+                                      rust-serde-json-1.0.107
+                                      rust-slab-0.4.9
+                                      rust-socket2-0.5.4
+                                      rust-strsim-0.10.0
+                                      rust-syn-0.11.11
+                                      rust-syn-1.0.109
+                                      rust-syn-2.0.38
+                                      rust-synom-0.11.3
+                                      rust-thiserror-1.0.49
+                                      rust-thiserror-impl-1.0.49
+                                      rust-tokio-1.32.0
+                                      rust-tokio-macros-2.1.0
+                                      rust-tokio-util-0.7.9
+                                      rust-tracing-0.1.37
+                                      rust-tracing-core-0.1.31
+                                      rust-unicode-ident-1.0.12
+                                      rust-unicode-segmentation-1.10.1
+                                      rust-unicode-xid-0.0.4
+                                      rust-utf8parse-0.2.1
+                                      rust-wasi-0.11.0+wasi-snapshot-preview1
+                                      rust-winapi-0.3.9
+                                      rust-winapi-i686-pc-windows-gnu-0.4.0
+                                      rust-winapi-x86-64-pc-windows-gnu-0.4.0
+                                      rust-windows-sys-0.48.0
+                                      rust-windows-targets-0.48.5
+                                      rust-windows-aarch64-gnullvm-0.48.5
+                                      rust-windows-aarch64-msvc-0.48.5
+                                      rust-windows-i686-gnu-0.48.5
+                                      rust-windows-i686-msvc-0.48.5
+                                      rust-windows-x86-64-gnu-0.48.5
+                                      rust-windows-x86-64-gnullvm-0.48.5
+                                      rust-windows-x86-64-msvc-0.48.5))
                      (ripgrep-all =>
                                   (list rust-addr2line-0.21.0
                                    rust-adler-1.0.2
@@ -1835,6 +2402,85 @@
                                    rust-zstd-safe-5.0.2+zstd.1.5.2
                                    rust-zstd-safe-7.0.0
                                    rust-zstd-sys-2.0.9+zstd.1.5.5))
+                     (sequence-detector =>
+                                        (list rust-ahash-0.7.6
+                                         rust-anstream-0.3.2
+                                         rust-anstyle-1.0.1
+                                         rust-anstyle-parse-0.2.1
+                                         rust-anstyle-query-1.0.0
+                                         rust-anstyle-wincon-1.0.1
+                                         rust-async-trait-0.1.71
+                                         rust-base64-0.13.1
+                                         rust-bitflags-1.3.2
+                                         rust-bitflags-2.3.3
+                                         rust-block-buffer-0.10.4
+                                         rust-cc-1.0.79
+                                         rust-cfg-if-1.0.0
+                                         rust-clap-4.3.11
+                                         rust-clap-builder-4.3.11
+                                         rust-clap-derive-4.3.2
+                                         rust-clap-lex-0.5.0
+                                         rust-colorchoice-1.0.0
+                                         rust-config-0.13.3
+                                         rust-cpufeatures-0.2.9
+                                         rust-crypto-common-0.1.6
+                                         rust-digest-0.10.7
+                                         rust-dlv-list-0.3.0
+                                         rust-errno-0.3.1
+                                         rust-errno-dragonfly-0.1.2
+                                         rust-generic-array-0.14.7
+                                         rust-getrandom-0.2.10
+                                         rust-hashbrown-0.12.3
+                                         rust-heck-0.4.1
+                                         rust-hermit-abi-0.3.2
+                                         rust-is-terminal-0.4.9
+                                         rust-itoa-1.0.8
+                                         rust-json5-0.4.1
+                                         rust-lazy-static-1.4.0
+                                         rust-libc-0.2.147
+                                         rust-linked-hash-map-0.5.6
+                                         rust-linux-raw-sys-0.4.3
+                                         rust-memchr-2.5.0
+                                         rust-minimal-lexical-0.2.1
+                                         rust-nom-7.1.3
+                                         rust-once-cell-1.18.0
+                                         rust-ordered-multimap-0.4.3
+                                         rust-pathdiff-0.2.1
+                                         rust-pest-2.7.0
+                                         rust-pest-derive-2.7.0
+                                         rust-pest-generator-2.7.0
+                                         rust-pest-meta-2.7.0
+                                         rust-proc-macro2-1.0.64
+                                         rust-quote-1.0.29
+                                         rust-ron-0.7.1
+                                         rust-rust-ini-0.18.0
+                                         rust-rustix-0.38.3
+                                         rust-ryu-1.0.14
+                                         rust-serde-1.0.169
+                                         rust-serde-derive-1.0.169
+                                         rust-serde-json-1.0.100
+                                         rust-sha2-0.10.7
+                                         rust-strsim-0.10.0
+                                         rust-syn-2.0.24
+                                         rust-thiserror-1.0.43
+                                         rust-thiserror-impl-1.0.43
+                                         rust-toml-0.5.11
+                                         rust-typenum-1.16.0
+                                         rust-ucd-trie-0.1.6
+                                         rust-unicode-ident-1.0.10
+                                         rust-utf8parse-0.2.1
+                                         rust-version-check-0.9.4
+                                         rust-wasi-0.11.0+wasi-snapshot-preview1
+                                         rust-windows-sys-0.48.0
+                                         rust-windows-targets-0.48.1
+                                         rust-windows-aarch64-gnullvm-0.48.0
+                                         rust-windows-aarch64-msvc-0.48.0
+                                         rust-windows-i686-gnu-0.48.0
+                                         rust-windows-i686-msvc-0.48.0
+                                         rust-windows-x86-64-gnu-0.48.0
+                                         rust-windows-x86-64-gnullvm-0.48.0
+                                         rust-windows-x86-64-msvc-0.48.0
+                                         rust-yaml-rust-0.4.5))
                      (vhdl-ls =>
                               (list rust-aho-corasick-1.1.3
                                     rust-anstream-0.6.18
diff --git a/modules/ruther/packages/ruther.scm b/modules/ruther/packages/ruther.scm
index e3a3e2ead49f3badce1a2e7b9c0f49eefe806a7b..300aa8c401488ae77b33c4dacace464afc653ac0 100644
--- a/modules/ruther/packages/ruther.scm
+++ b/modules/ruther/packages/ruther.scm
@@ -1,131 +1,12 @@
 (define-module (ruther packages ruther)
+  #:use-module (ruther packages rust-crates)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages pkg-config)
-  #:use-module (guix build-system cargo)
-  )
-(define-public rust-from-variants-impl-1
-  (package
-    (name "rust-from-variants-impl")
-    (version "1.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "from_variants_impl" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "17p6djij0ar0c9dlfnq4dj9bgmq16fcsf3winjr9cv8fm12fd9am"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-darling" ,rust-darling-0.14)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/TedDriggs/from_variants")
-    (synopsis "Internal helper crate for from_variants crate")
-    (description
-     "This package provides Internal helper crate for from_variants crate.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-from-variants-1
-  (package
-    (name "rust-from-variants")
-    (version "1.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "from_variants" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1wmv85523z261vwmx1iqjykf0dp8fvy9kgjxj0c7cs2p427rr1af"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-from-variants-impl" ,rust-from-variants-impl-1))))
-    (home-page "https://github.com/TedDriggs/from_variants")
-    (synopsis
-     "Rust macro to automatically generate conversions for newtype enums")
-    (description
-     "This package provides Rust macro to automatically generate conversions for newtype enums.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-enum-kinds-0.5
-  (package
-    (name "rust-enum-kinds")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "enum-kinds" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0qnlgzlsydnxsgcf2lkvqsrmdxignjkam1fsnfd4c7b8amls2h2f"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1))))
-    (home-page "https://github.com/Soft/enum-kinds")
-    (synopsis
-     "Generate enums with matching variants but without any of the associated data")
-    (description
-     "This package provides Generate enums with matching variants but without any of the associated data.")
-    (license license:expat)))
-
-(define-public rust-derive-is-enum-variant-0.1
-  (package
-    (name "rust-derive-is-enum-variant")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "derive_is_enum_variant" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "15w18649m4h47pdpr04id0wv8br8bg606zvrafcrfijihicqib6h"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-heck" ,rust-heck-0.3)
-                       ("rust-quote" ,rust-quote-0.3)
-                       ("rust-syn" ,rust-syn-0.11))))
-    (home-page "https://github.com/fitzgen/derive_is_enum_variant")
-    (synopsis
-     "Automatically derives `is_dog` and `is_cat` methods for `enum Pet { Dog, Cat }`")
-    (description
-     "This package provides Automatically derives `is_dog` and `is_cat` methods for `enum Pet { Dog, Cat }`.")
-    (license (list license:asl2.0 license:expat))))
-
-(define-public rust-mpris-2
-  (package
-    (name "rust-mpris")
-    (version "2.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "mpris" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1svzblilq3kxgra63axl3wibsnl9g8p6b8q1x401wsw2lxazkkjm"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-dbus" ,rust-dbus-0.9)
-                       ("rust-derive-is-enum-variant" ,rust-derive-is-enum-variant-0.1)
-                       ("rust-enum-kinds" ,rust-enum-kinds-0.5)
-                       ("rust-from-variants" ,rust-from-variants-1)
-                       ("rust-thiserror" ,rust-thiserror-1))
-       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
-                                   ("rust-termion" ,rust-termion-2))))
-    (home-page "https://github.com/Mange/mpris-rs")
-    (synopsis "Idiomatic MPRIS D-Bus interface library")
-    (description
-     "This package provides Idiomatic MPRIS D-Bus interface library.")
-    (license license:asl2.0)))
+  #:use-module (guix build-system cargo))
 
 (define-public mpris-ctl
   (package
@@ -137,21 +18,15 @@
        (uri (git-reference
              (url "https://git.ditigal.xyz/~ruther/mpris-ctl")
              (commit "c5731a17d99553d79810791e5a5aff61344669d5")))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "0jkfdyx3xcvv5nlzgb9qd15j4km9jfaj4x8rlf2il6vclmknj4xz"))))
     (build-system cargo-build-system)
     (native-inputs
      (list pkg-config))
     (inputs
-     (list dbus))
-    (arguments
-     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
-                       ("rust-futures" ,rust-futures-0.3)
-                       ("rust-mpris" ,rust-mpris-2)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-tokio" ,rust-tokio-1)
-                       ("rust-tokio-util", rust-tokio-util-0.7))))
+     `(,dbus
+       ,@(my-cargo-inputs 'mpris-ctl)))
     (synopsis "Lightweight mpris control client")
     (description "Lightweight mpris control client")
     (home-page "https://github.com/Rutherther/mpris-ctl")
@@ -170,15 +45,12 @@
        (uri (git-reference
              (url "https://git.ditigal.xyz/~ruther/sequence-detector")
              (commit "c447c0d83877907c3ade8a2e9b4f659d4ef92904")))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "06719x0fv8arpld0n1kwc0v507gpbqjp3sx3kin72441fq9qi3q6"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-clap" ,rust-clap-4)
-                       ("rust-config" ,rust-config-0.13)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-serde-derive" ,rust-serde-derive-1))))
+    (inputs
+     (my-cargo-inputs 'sequence-detector))
     (synopsis "Detects sequences of inputs in short time")
     (description "For example, if you want to have more control
 out of your headset, this gives more control by listening for a