From 45f213762a0624b91cee8338ed03d1fbb36eda4b Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@ditigal.xyz>
Date: Sun, 4 May 2025 13:40:40 +0200
Subject: [PATCH] feat: switch vhdl-ls to new rust packaging method

---
 modules/ruther/packages/rust-crates.scm | 881 ++++++++++++++++++++++++
 modules/ruther/packages/vhdl-ls.scm     | 309 +--------
 2 files changed, 886 insertions(+), 304 deletions(-)
 create mode 100644 modules/ruther/packages/rust-crates.scm

diff --git a/modules/ruther/packages/rust-crates.scm b/modules/ruther/packages/rust-crates.scm
new file mode 100644
index 0000000..e145628
--- /dev/null
+++ b/modules/ruther/packages/rust-crates.scm
@@ -0,0 +1,881 @@
+(define-module (ruther packages rust-crates)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cargo)
+  #:export (lookup-cargo-inputs
+            my-cargo-inputs))
+
+(define* (crate-name->package-name name)
+  (downstream-package-name "rust-" name))
+
+(define* (crate-source name version hash #:key (patches '()) (snippet #f))
+  (origin
+    (method url-fetch)
+    (uri (crate-uri name version))
+    (file-name
+     (string-append (crate-name->package-name name) "-" version ".tar.gz"))
+    (sha256 (base32 hash))
+    (modules '((guix build utils)))
+    (patches patches)
+    (snippet snippet)))
+
+(define-syntax define-cargo-inputs
+  (syntax-rules (=>)
+    ((_ lookup inputs ...)
+     (define lookup
+       (let ((table (make-hash-table)))
+         (letrec-syntax ((record
+                          (syntax-rules (=>)
+                            ((_) #t)
+                            ((_ (name => lst) rest (... ...))
+                             (begin
+                               (hashq-set! table 'name (filter identity lst))
+                               (record rest (... ...)))))))
+           (record inputs ...)
+           (lambda (name)
+             "Return the inputs for NAME."
+             (hashq-ref table name))))))))
+
+(define* (my-cargo-inputs name
+                          ;; NOTE: Change to your own module.
+                          #:key (module '(ruther packages rust-crates)))
+  "Lookup Cargo inputs for NAME defined in MODULE, return an empty list if
+      unavailable."
+  (let ((lookup (module-ref (resolve-interface module) 'lookup-cargo-inputs)))
+    (or (lookup name)
+        (begin
+          (warning (G_ "no Cargo inputs available for '~a'~%") name)
+          '()))))
+
+
+;;;
+;;; This file is managed by ‘guix import’.  Do NOT add definitions manually.
+;;;
+
+;;;
+;;; Rust libraries fetched from crates.io and non-workspace development
+;;; snapshots.
+;;;
+
+(define qqqq-separator 'begin-of-crates)
+
+(define rust-aho-corasick-1.1.3
+  (crate-source "aho-corasick" "1.1.3"
+                "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f"))
+
+(define rust-anstream-0.6.18
+  (crate-source "anstream" "0.6.18"
+                "16sjk4x3ns2c3ya1x28a44kh6p47c7vhk27251i015hik1lm7k4a"))
+
+(define rust-anstyle-1.0.10
+  (crate-source "anstyle" "1.0.10"
+                "1yai2vppmd7zlvlrp9grwll60knrmscalf8l2qpfz8b7y5lkpk2m"))
+
+(define rust-anstyle-parse-0.2.6
+  (crate-source "anstyle-parse" "0.2.6"
+                "1acqayy22fwzsrvr6n0lz6a4zvjjcvgr5sm941m7m0b2fr81cb9v"))
+
+(define rust-anstyle-query-1.1.2
+  (crate-source "anstyle-query" "1.1.2"
+                "036nm3lkyk43xbps1yql3583fp4hg3b1600is7mcyxs1gzrpm53r"))
+
+(define rust-anstyle-wincon-3.0.6
+  (crate-source "anstyle-wincon" "3.0.6"
+                "099ir0w3lbpsp1nxdzbf4anq98ww8ykyc9pd1g03xgkj1v7dn291"))
+
+(define rust-assert-cmd-2.0.16
+  (crate-source "assert_cmd" "2.0.16"
+                "0gdj0710k3lnvyjmpv8a4dgwrk9ib85l2wfw4n2xwy3qyavka66w"))
+
+(define rust-assert-matches-1.5.0
+  (crate-source "assert_matches" "1.5.0"
+                "1a9b3p9vy0msylyr2022sk5flid37ini1dxji5l3vwxsvw4xcd4v"))
+
+(define rust-autocfg-1.4.0
+  (crate-source "autocfg" "1.4.0"
+                "09lz3by90d2hphbq56znag9v87gfpd9gb8nr82hll8z6x2nhprdc"))
+
+(define rust-bitflags-1.3.2
+  (crate-source "bitflags" "1.3.2"
+                "12ki6w8gn1ldq7yz9y680llwk5gmrhrzszaa17g1sbrw2r2qvwxy"))
+
+(define rust-bitflags-2.6.0
+  (crate-source "bitflags" "2.6.0"
+                "1pkidwzn3hnxlsl8zizh0bncgbjnw7c41cx7bby26ncbzmiznj5h"))
+
+(define rust-brunch-0.8.0
+  (crate-source "brunch" "0.8.0"
+                "02pnxklbdqrj3bsimiji1rzir84si81y6b9qvdag0nrf26l5fylw"))
+
+(define rust-bstr-1.11.0
+  (crate-source "bstr" "1.11.0"
+                "08my0pjgnqxc17fw061inxnpkjw05bp2w6wl9gpch3nzgksg2s0s"))
+
+(define rust-cfg-if-1.0.0
+  (crate-source "cfg-if" "1.0.0"
+                "1za0vb97n4brpzpv8lsbnzmq5r8f2b0cpqqr0sy8h5bn751xxwds"))
+
+(define rust-clap-4.5.23
+  (crate-source "clap" "4.5.23"
+                "110cf0i9fmkfqzqhi1h8za9y0vnr5rwhy3wmv1p0rcgp5vnffd9i"))
+
+(define rust-clap-builder-4.5.23
+  (crate-source "clap_builder" "4.5.23"
+                "0f28rgc09kdgfq1hgg1bb1ydaw243w6dwyw74syz439k6b32yn1h"))
+
+(define rust-clap-derive-4.5.18
+  (crate-source "clap_derive" "4.5.18"
+                "1ardb26bvcpg72q9myr7yir3a8c83gx7vxk1cccabsd9n73s1ija"))
+
+(define rust-clap-lex-0.7.4
+  (crate-source "clap_lex" "0.7.4"
+                "19nwfls5db269js5n822vkc8dw0wjq2h1wf0hgr06ld2g52d2spl"))
+
+(define rust-colorchoice-1.0.3
+  (crate-source "colorchoice" "1.0.3"
+                "1439m3r3jy3xqck8aa13q658visn71ki76qa93cy55wkmalwlqsv"))
+
+(define rust-crossbeam-channel-0.5.13
+  (crate-source "crossbeam-channel" "0.5.13"
+                "1wkx45r34v7g3wyi3lg2wz536lrrrab4h4hh741shfhr8rlhsj1k"))
+
+(define rust-crossbeam-deque-0.8.5
+  (crate-source "crossbeam-deque" "0.8.5"
+                "03bp38ljx4wj6vvy4fbhx41q8f585zyqix6pncz1mkz93z08qgv1"))
+
+(define rust-crossbeam-epoch-0.9.18
+  (crate-source "crossbeam-epoch" "0.9.18"
+                "03j2np8llwf376m3fxqx859mgp9f83hj1w34153c7a9c7i5ar0jv"))
+
+(define rust-crossbeam-utils-0.8.20
+  (crate-source "crossbeam-utils" "0.8.20"
+                "100fksq5mm1n7zj242cclkw6yf7a4a8ix3lvpfkhxvdhbda9kv12"))
+
+(define rust-dactyl-0.9.0
+  (crate-source "dactyl" "0.9.0"
+                "0frcj0fl7mjc9fsdfcymp1cfrhyv7w2fqdj7isa7dpmwhasfavxr"))
+
+(define rust-diff-0.1.13
+  (crate-source "diff" "0.1.13"
+                "1j0nzjxci2zqx63hdcihkp0a4dkdmzxd7my4m7zk6cjyfy34j9an"))
+
+(define rust-difflib-0.4.0
+  (crate-source "difflib" "0.4.0"
+                "1s7byq4d7jgf2hcp2lcqxi2piqwl8xqlharfbi8kf90n8csy7131"))
+
+(define rust-dirs-5.0.1
+  (crate-source "dirs" "5.0.1"
+                "0992xk5vx75b2x91nw9ssb51mpl8x73j9rxmpi96cryn0ffmmi24"))
+
+(define rust-dirs-sys-0.4.1
+  ;; TODO: Check bundled sources.
+  (crate-source "dirs-sys" "0.4.1"
+                "071jy0pvaad9lsa6mzawxrh7cmr7hsmsdxwzm7jzldfkrfjha3sj"))
+
+(define rust-displaydoc-0.2.5
+  (crate-source "displaydoc" "0.2.5"
+                "1q0alair462j21iiqwrr21iabkfnb13d6x5w95lkdg21q2xrqdlp"))
+
+(define rust-doc-comment-0.3.3
+  (crate-source "doc-comment" "0.3.3"
+                "043sprsf3wl926zmck1bm7gw0jq50mb76lkpk49vasfr6ax1p97y"))
+
+(define rust-dunce-1.0.5
+  (crate-source "dunce" "1.0.5"
+                "04y8wwv3vvcqaqmqzssi6k0ii9gs6fpz96j5w9nky2ccsl23axwj"))
+
+(define rust-either-1.13.0
+  (crate-source "either" "1.13.0"
+                "1w2c1mybrd7vljyxk77y9f4w9dyjrmp3yp82mk7bcm8848fazcb0"))
+
+(define rust-enum-map-2.7.3
+  (crate-source "enum-map" "2.7.3"
+                "1sgjgl4mmz93jdkfdsmapc3dmaq8gddagw9s0fd501w2vyzz6rk8"))
+
+(define rust-enum-map-derive-0.17.0
+  (crate-source "enum-map-derive" "0.17.0"
+                "1sv4mb343rsz4lc3rh7cyn0pdhf7fk18k1dgq8kfn5i5x7gwz0pj"))
+
+(define rust-env-filter-0.1.2
+  (crate-source "env_filter" "0.1.2"
+                "1avnnd60ig6q5ixxxbwicwkxpqjg8bl9x7qn8c7wbvkcvb794b2g"))
+
+(define rust-env-logger-0.11.5
+  (crate-source "env_logger" "0.11.5"
+                "13812wq68kybv2vj6rpnhbl7ammlhggcb7vq68bkichzp4cscgz1"))
+
+(define rust-equivalent-1.0.1
+  (crate-source "equivalent" "1.0.1"
+                "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"))
+
+(define rust-errno-0.3.10
+  (crate-source "errno" "0.3.10"
+                "0pgblicz1kjz9wa9m0sghkhh2zw1fhq1mxzj7ndjm746kg5m5n1k"))
+
+(define rust-fastrand-2.3.0
+  (crate-source "fastrand" "2.3.0"
+                "1ghiahsw1jd68df895cy5h3gzwk30hndidn3b682zmshpgmrx41p"))
+
+(define rust-float-cmp-0.9.0
+  (crate-source "float-cmp" "0.9.0"
+                "1i799ksbq7fj9rm9m82g1yqgm6xi3jnrmylddmqknmksajylpplq"))
+
+(define rust-fnv-1.0.7
+  (crate-source "fnv" "1.0.7"
+                "1hc2mcqha06aibcaza94vbi81j6pr9a1bbxrxjfhc91zin8yr7iz"))
+
+(define rust-form-urlencoded-1.2.1
+  (crate-source "form_urlencoded" "1.2.1"
+                "0milh8x7nl4f450s3ddhg57a3flcv6yq8hlkyk6fyr3mcb128dp1"))
+
+(define rust-fuzzy-matcher-0.3.7
+  (crate-source "fuzzy-matcher" "0.3.7"
+                "153csv8rsk2vxagb68kpmiknvdd3bzqj03x805khckck28rllqal"))
+
+(define rust-getrandom-0.2.15
+  (crate-source "getrandom" "0.2.15"
+                "1mzlnrb3dgyd1fb84gvw10pyr8wdqdl4ry4sr64i1s8an66pqmn4"))
+
+(define rust-glob-0.3.1
+  (crate-source "glob" "0.3.1"
+                "16zca52nglanv23q5qrwd5jinw3d3as5ylya6y1pbx47vkxvrynj"))
+
+(define rust-hashbrown-0.15.2
+  (crate-source "hashbrown" "0.15.2"
+                "12dj0yfn59p3kh3679ac0w1fagvzf4z2zp87a13gbbqbzw0185dz"))
+
+(define rust-heck-0.5.0
+  (crate-source "heck" "0.5.0"
+                "1sjmpsdl8czyh9ywl3qcsfsq9a307dg4ni2vnlwgnzzqhc4y0113"))
+
+(define rust-humantime-2.1.0
+  (crate-source "humantime" "2.1.0"
+                "1r55pfkkf5v0ji1x6izrjwdq9v6sc7bv99xj6srywcar37xmnfls"))
+
+(define rust-icu-collections-1.5.0
+  (crate-source "icu_collections" "1.5.0"
+                "09j5kskirl59mvqc8kabhy7005yyy7dp88jw9f6f3gkf419a8byv"))
+
+(define rust-icu-locid-1.5.0
+  (crate-source "icu_locid" "1.5.0"
+                "0dznvd1c5b02iilqm044q4hvar0sqibq1z46prqwjzwif61vpb0k"))
+
+(define rust-icu-locid-transform-1.5.0
+  (crate-source "icu_locid_transform" "1.5.0"
+                "0kmmi1kmj9yph6mdgkc7v3wz6995v7ly3n80vbg0zr78bp1iml81"))
+
+(define rust-icu-locid-transform-data-1.5.0
+  (crate-source "icu_locid_transform_data" "1.5.0"
+                "0vkgjixm0wzp2n3v5mw4j89ly05bg3lx96jpdggbwlpqi0rzzj7x"))
+
+(define rust-icu-normalizer-1.5.0
+  (crate-source "icu_normalizer" "1.5.0"
+                "0kx8qryp8ma8fw1vijbgbnf7zz9f2j4d14rw36fmjs7cl86kxkhr"))
+
+(define rust-icu-normalizer-data-1.5.0
+  (crate-source "icu_normalizer_data" "1.5.0"
+                "05lmk0zf0q7nzjnj5kbmsigj3qgr0rwicnn5pqi9n7krmbvzpjpq"))
+
+(define rust-icu-properties-1.5.1
+  (crate-source "icu_properties" "1.5.1"
+                "1xgf584rx10xc1p7zjr78k0n4zn3g23rrg6v2ln31ingcq3h5mlk"))
+
+(define rust-icu-properties-data-1.5.0
+  (crate-source "icu_properties_data" "1.5.0"
+                "0scms7pd5a7yxx9hfl167f5qdf44as6r3bd8myhlngnxqgxyza37"))
+
+(define rust-icu-provider-1.5.0
+  (crate-source "icu_provider" "1.5.0"
+                "1nb8vvgw8dv2inqklvk05fs0qxzkw8xrg2n9vgid6y7gm3423m3f"))
+
+(define rust-icu-provider-macros-1.5.0
+  (crate-source "icu_provider_macros" "1.5.0"
+                "1mjs0w7fcm2lcqmbakhninzrjwqs485lkps4hz0cv3k36y9rxj0y"))
+
+(define rust-idna-1.0.3
+  (crate-source "idna" "1.0.3"
+                "0zlajvm2k3wy0ay8plr07w22hxkkmrxkffa6ah57ac6nci984vv8"))
+
+(define rust-idna-adapter-1.2.0
+  (crate-source "idna_adapter" "1.2.0"
+                "0wggnkiivaj5lw0g0384ql2d7zk4ppkn3b1ry4n0ncjpr7qivjns"))
+
+(define rust-indexmap-2.7.0
+  (crate-source "indexmap" "2.7.0"
+                "07s7jmdymvd0rm4yswp0j3napx57hkjm9gs9n55lvs2g78vj5y32"))
+
+(define rust-is-terminal-polyfill-1.70.1
+  (crate-source "is_terminal_polyfill" "1.70.1"
+                "1kwfgglh91z33kl0w5i338mfpa3zs0hidq5j4ny4rmjwrikchhvr"))
+
+(define rust-itertools-0.13.0
+  (crate-source "itertools" "0.13.0"
+                "11hiy3qzl643zcigknclh446qb9zlg4dpdzfkjaa9q9fqpgyfgj1"))
+
+(define rust-itoa-1.0.14
+  (crate-source "itoa" "1.0.14"
+                "0x26kr9m062mafaxgcf2p6h2x7cmixm0zw95aipzn2hr3d5jlnnp"))
+
+(define rust-libc-0.2.167
+  (crate-source "libc" "0.2.167"
+                "1z06pa4y2x2arwm7si12xsaf1cj46l9pazzrvwbsh5a320p5imh9"))
+
+(define rust-libredox-0.1.3
+  (crate-source "libredox" "0.1.3"
+                "139602gzgs0k91zb7dvgj1qh4ynb8g1lbxsswdim18hcb6ykgzy0"))
+
+(define rust-linux-raw-sys-0.4.14
+  ;; TODO: Check bundled sources.
+  (crate-source "linux-raw-sys" "0.4.14"
+                "12gsjgbhhjwywpqcrizv80vrp7p7grsz5laqq773i33wphjsxcvq"))
+
+(define rust-litemap-0.7.4
+  (crate-source "litemap" "0.7.4"
+                "012ili3vppd4952sh6y3qwcd0jkd0bq2qpr9h7cppc8sj11k7saf"))
+
+(define rust-lock-api-0.4.12
+  (crate-source "lock_api" "0.4.12"
+                "05qvxa6g27yyva25a5ghsg85apdxkvr77yhkyhapj6r8vnf8pbq7"))
+
+(define rust-log-0.4.22
+  (crate-source "log" "0.4.22"
+                "093vs0wkm1rgyykk7fjbqp2lwizbixac1w52gv109p5r4jh0p9x7"))
+
+(define rust-lsp-server-0.7.7
+  (crate-source "lsp-server" "0.7.7"
+                "1nbw4sz42445cj6qykd3x09rwrjh72br785491nszp1r8zl4c12m"))
+
+(define rust-lsp-types-0.95.1
+  (crate-source "lsp-types" "0.95.1"
+                "0ra36fd4yr7lf5igfrdvwjx9g87z3a99mrjgzk9nq04viqxd6d4f"))
+
+(define rust-memchr-2.7.4
+  (crate-source "memchr" "2.7.4"
+                "18z32bhxrax0fnjikv475z7ii718hq457qwmaryixfxsl2qrmjkq"))
+
+(define rust-normalize-line-endings-0.3.0
+  (crate-source "normalize-line-endings" "0.3.0"
+                "1gp52dfn2glz26a352zra8h04351icf0fkqzw1shkwrgh1vpz031"))
+
+(define rust-num-traits-0.2.19
+  (crate-source "num-traits" "0.2.19"
+                "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787"))
+
+(define rust-once-cell-1.20.2
+  (crate-source "once_cell" "1.20.2"
+                "0xb7rw1aqr7pa4z3b00y7786gyf8awx2gca3md73afy76dzgwq8j"))
+
+(define rust-option-ext-0.2.0
+  (crate-source "option-ext" "0.2.0"
+                "0zbf7cx8ib99frnlanpyikm1bx8qn8x602sw1n7bg6p9x94lyx04"))
+
+(define rust-pad-0.1.6
+  (crate-source "pad" "0.1.6"
+                "1qy0r26r52gp034fv252mmg0s599a55h9nr4xswy04hvky49pbfj"))
+
+(define rust-parking-lot-0.12.3
+  (crate-source "parking_lot" "0.12.3"
+                "09ws9g6245iiq8z975h8ycf818a66q3c6zv4b5h8skpm7hc1igzi"))
+
+(define rust-parking-lot-core-0.9.10
+  (crate-source "parking_lot_core" "0.9.10"
+                "1y3cf9ld9ijf7i4igwzffcn0xl16dxyn4c5bwgjck1dkgabiyh0y"))
+
+(define rust-percent-encoding-2.3.1
+  (crate-source "percent-encoding" "2.3.1"
+                "0gi8wgx0dcy8rnv1kywdv98lwcx67hz0a0zwpib5v2i08r88y573"))
+
+(define rust-pinned-vec-0.1.1
+  (crate-source "pinned_vec" "0.1.1"
+                "12il2y234k9r4i3v9yh7qpavrwdhi48b057z96hb0bv2j8nxi2i6"))
+
+(define rust-predicates-3.1.2
+  (crate-source "predicates" "3.1.2"
+                "15rcyjax4ykflw5425wsyzcfkgl08c9zsa8sdlsrmhj0fv68d43y"))
+
+(define rust-predicates-core-1.0.8
+  (crate-source "predicates-core" "1.0.8"
+                "0c8rl6d7qkcl773fw539h61fhlgdg7v9yswwb536hpg7x2z7g0df"))
+
+(define rust-predicates-tree-1.0.11
+  (crate-source "predicates-tree" "1.0.11"
+                "04zv0i9pjfrldnvyxf4y07n243nvk3n4g03w2k6nccgdjp8l1ds1"))
+
+(define rust-pretty-assertions-1.4.1
+  (crate-source "pretty_assertions" "1.4.1"
+                "0v8iq35ca4rw3rza5is3wjxwsf88303ivys07anc5yviybi31q9s"))
+
+(define rust-proc-macro2-1.0.92
+  (crate-source "proc-macro2" "1.0.92"
+                "1c1vjy5wg8iy7kxsxda564qf4ljp0asysmbn2i7caj177x5m9lrp"))
+
+(define rust-quote-1.0.37
+  (crate-source "quote" "1.0.37"
+                "1brklraw2g34bxy9y4q1nbrccn7bv36ylihv12c9vlcii55x7fdm"))
+
+(define rust-rayon-1.10.0
+  (crate-source "rayon" "1.10.0"
+                "1ylgnzwgllajalr4v00y4kj22klq2jbwllm70aha232iah0sc65l"))
+
+(define rust-rayon-core-1.12.1
+  (crate-source "rayon-core" "1.12.1"
+                "1qpwim68ai5h0j7axa8ai8z0payaawv3id0lrgkqmapx7lx8fr8l"))
+
+(define rust-redox-syscall-0.5.7
+  (crate-source "redox_syscall" "0.5.7"
+                "07vpgfr6a04k0x19zqr1xdlqm6fncik3zydbdi3f5g3l5k7zwvcv"))
+
+(define rust-redox-users-0.4.6
+  (crate-source "redox_users" "0.4.6"
+                "0hya2cxx6hxmjfxzv9n8rjl5igpychav7zfi1f81pz6i4krry05s"))
+
+(define rust-regex-1.11.1
+  (crate-source "regex" "1.11.1"
+                "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m"))
+
+(define rust-regex-automata-0.4.9
+  (crate-source "regex-automata" "0.4.9"
+                "02092l8zfh3vkmk47yjc8d631zhhcd49ck2zr133prvd3z38v7l0"))
+
+(define rust-regex-syntax-0.8.5
+  (crate-source "regex-syntax" "0.8.5"
+                "0p41p3hj9ww7blnbwbj9h7rwxzxg0c1hvrdycgys8rxyhqqw859b"))
+
+(define rust-rustix-0.38.42
+  (crate-source "rustix" "0.38.42"
+                "11fvprv3p450ggyqacp7sdpjbbsgm5zvfjwnzy8bfbmbrf7c6ggr"))
+
+(define rust-rustversion-1.0.18
+  (crate-source "rustversion" "1.0.18"
+                "0j2207vmgrcxwwwvknfn3lwv4i8djhjnxlvwdnz8bwijqqmrz08f"))
+
+(define rust-ryu-1.0.18
+  (crate-source "ryu" "1.0.18"
+                "17xx2s8j1lln7iackzd9p0sv546vjq71i779gphjq923vjh5pjzk"))
+
+(define rust-scopeguard-1.2.0
+  (crate-source "scopeguard" "1.2.0"
+                "0jcz9sd47zlsgcnm1hdw0664krxwb5gczlif4qngj2aif8vky54l"))
+
+(define rust-serde-1.0.215
+  (crate-source "serde" "1.0.215"
+                "13xqkw93cw9rnbkm0zy1apnilzq7l2xf1qw8m1nkga8i1fnw24v5"))
+
+(define rust-serde-derive-1.0.215
+  (crate-source "serde_derive" "1.0.215"
+                "1h2nswy0rmzblil38h12wxsgni1ik63rk22wy19g48v9hrpqc7md"))
+
+(define rust-serde-json-1.0.133
+  (crate-source "serde_json" "1.0.133"
+                "0xz3bswa527wln3fy0qb7y081nx3cp5yy1ggjhi6n5mrfcjfpz67"))
+
+(define rust-serde-repr-0.1.19
+  (crate-source "serde_repr" "0.1.19"
+                "1sb4cplc33z86pzlx38234xr141wr3cmviqgssiadisgl8dlar3c"))
+
+(define rust-serde-spanned-0.6.8
+  (crate-source "serde_spanned" "0.6.8"
+                "1q89g70azwi4ybilz5jb8prfpa575165lmrffd49vmcf76qpqq47"))
+
+(define rust-smallvec-1.13.2
+  (crate-source "smallvec" "1.13.2"
+                "0rsw5samawl3wsw6glrsb127rx6sh89a8wyikicw6dkdcjd1lpiw"))
+
+(define rust-stable-deref-trait-1.2.0
+  (crate-source "stable_deref_trait" "1.2.0"
+                "1lxjr8q2n534b2lhkxd6l6wcddzjvnksi58zv11f9y0jjmr15wd8"))
+
+(define rust-strsim-0.11.1
+  (crate-source "strsim" "0.11.1"
+                "0kzvqlw8hxqb7y598w1s0hxlnmi84sg5vsipp3yg5na5d1rvba3x"))
+
+(define rust-strum-0.26.3
+  (crate-source "strum" "0.26.3"
+                "01lgl6jvrf4j28v5kmx9bp480ygf1nhvac8b4p7rcj9hxw50zv4g"))
+
+(define rust-strum-macros-0.26.4
+  (crate-source "strum_macros" "0.26.4"
+                "1gl1wmq24b8md527cpyd5bw9rkbqldd7k1h38kf5ajd2ln2ywssc"))
+
+(define rust-subst-0.3.5
+  (crate-source "subst" "0.3.5"
+                "07036gcmfrhizj6xswarrziqddn9bwhgwq9s6dkci6q1znj1ng3s"))
+
+(define rust-syn-2.0.90
+  (crate-source "syn" "2.0.90"
+                "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci"))
+
+(define rust-synstructure-0.13.1
+  (crate-source "synstructure" "0.13.1"
+                "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8"))
+
+(define rust-tempfile-3.14.0
+  (crate-source "tempfile" "3.14.0"
+                "037f9jm13bmfc6xq9w86dp0nylrddh6ynvl6db4gm1xwzi8y5k18"))
+
+(define rust-termtree-0.4.1
+  (crate-source "termtree" "0.4.1"
+                "0xkal5l2r3r9p9j90x35qy4npbdwxz4gskvbijs6msymaangas9k"))
+
+(define rust-thiserror-1.0.69
+  (crate-source "thiserror" "1.0.69"
+                "0lizjay08agcr5hs9yfzzj6axs53a2rgx070a1dsi3jpkcrzbamn"))
+
+(define rust-thiserror-impl-1.0.69
+  (crate-source "thiserror-impl" "1.0.69"
+                "1h84fmn2nai41cxbhk6pqf46bxqq1b344v8yz089w1chzi76rvjg"))
+
+(define rust-thread-local-1.1.8
+  (crate-source "thread_local" "1.1.8"
+                "173i5lyjh011gsimk21np9jn8al18rxsrkjli20a7b8ks2xgk7lb"))
+
+(define rust-tinystr-0.7.6
+  (crate-source "tinystr" "0.7.6"
+                "0bxqaw7z8r2kzngxlzlgvld1r6jbnwyylyvyjbv1q71rvgaga5wi"))
+
+(define rust-toml-0.8.19
+  (crate-source "toml" "0.8.19"
+                "0knjd3mkxyb87qcs2dark3qkpadidap3frqfj5nqvhpxwfc1zvd1"))
+
+(define rust-toml-datetime-0.6.8
+  (crate-source "toml_datetime" "0.6.8"
+                "0hgv7v9g35d7y9r2afic58jvlwnf73vgd1mz2k8gihlgrf73bmqd"))
+
+(define rust-toml-edit-0.22.22
+  (crate-source "toml_edit" "0.22.22"
+                "1xf7sxfzmnc45f75x302qrn5aph52vc8w226v59yhrm211i8vr2a"))
+
+(define rust-unicode-ident-1.0.14
+  (crate-source "unicode-ident" "1.0.14"
+                "10ywa1pg0glgkr4l3dppjxizr9r2b7im0ycbfa0137l69z5fdfdd"))
+
+(define rust-unicode-width-0.1.14
+  (crate-source "unicode-width" "0.1.14"
+                "1bzn2zv0gp8xxbxbhifw778a7fc93pa6a1kj24jgg9msj07f7mkx"))
+
+(define rust-unicode-width-0.2.0
+  (crate-source "unicode-width" "0.2.0"
+                "1zd0r5vs52ifxn25rs06gxrgz8cmh4xpra922k0xlmrchib1kj0z"))
+
+(define rust-url-2.5.4
+  (crate-source "url" "2.5.4"
+                "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j"))
+
+(define rust-utf16-iter-1.0.5
+  (crate-source "utf16_iter" "1.0.5"
+                "0ik2krdr73hfgsdzw0218fn35fa09dg2hvbi1xp3bmdfrp9js8y8"))
+
+(define rust-utf8-iter-1.0.4
+  (crate-source "utf8_iter" "1.0.4"
+                "1gmna9flnj8dbyd8ba17zigrp9c4c3zclngf5lnb5yvz1ri41hdn"))
+
+(define rust-utf8parse-0.2.2
+  (crate-source "utf8parse" "0.2.2"
+                "088807qwjq46azicqwbhlmzwrbkz7l4hpw43sdkdyyk524vdxaq6"))
+
+(define rust-wait-timeout-0.2.0
+  (crate-source "wait-timeout" "0.2.0"
+                "1xpkk0j5l9pfmjfh1pi0i89invlavfrd9av5xp0zhxgb29dhy84z"))
+
+(define rust-wasi-0.11.0+wasi-snapshot-preview1
+  (crate-source "wasi" "0.11.0+wasi-snapshot-preview1"
+                "08z4hxwkpdpalxjps1ai9y7ihin26y9f476i53dv98v45gkqg3cw"))
+
+(define rust-windows-aarch64-gnullvm-0.48.5
+  (crate-source "windows_aarch64_gnullvm" "0.48.5"
+                "1n05v7qblg1ci3i567inc7xrkmywczxrs1z3lj3rkkxw18py6f1b"))
+
+(define rust-windows-aarch64-gnullvm-0.52.6
+  (crate-source "windows_aarch64_gnullvm" "0.52.6"
+                "1lrcq38cr2arvmz19v32qaggvj8bh1640mdm9c2fr877h0hn591j"))
+
+(define rust-windows-aarch64-msvc-0.48.5
+  (crate-source "windows_aarch64_msvc" "0.48.5"
+                "1g5l4ry968p73g6bg6jgyvy9lb8fyhcs54067yzxpcpkf44k2dfw"))
+
+(define rust-windows-aarch64-msvc-0.52.6
+  (crate-source "windows_aarch64_msvc" "0.52.6"
+                "0sfl0nysnz32yyfh773hpi49b1q700ah6y7sacmjbqjjn5xjmv09"))
+
+(define rust-windows-i686-gnu-0.48.5
+  (crate-source "windows_i686_gnu" "0.48.5"
+                "0gklnglwd9ilqx7ac3cn8hbhkraqisd0n83jxzf9837nvvkiand7"))
+
+(define rust-windows-i686-gnu-0.52.6
+  (crate-source "windows_i686_gnu" "0.52.6"
+                "02zspglbykh1jh9pi7gn8g1f97jh1rrccni9ivmrfbl0mgamm6wf"))
+
+(define rust-windows-i686-gnullvm-0.52.6
+  (crate-source "windows_i686_gnullvm" "0.52.6"
+                "0rpdx1537mw6slcpqa0rm3qixmsb79nbhqy5fsm3q2q9ik9m5vhf"))
+
+(define rust-windows-i686-msvc-0.48.5
+  (crate-source "windows_i686_msvc" "0.48.5"
+                "01m4rik437dl9rdf0ndnm2syh10hizvq0dajdkv2fjqcywrw4mcg"))
+
+(define rust-windows-i686-msvc-0.52.6
+  (crate-source "windows_i686_msvc" "0.52.6"
+                "0rkcqmp4zzmfvrrrx01260q3xkpzi6fzi2x2pgdcdry50ny4h294"))
+
+(define rust-windows-sys-0.48.0
+  ;; TODO: Check bundled sources.
+  (crate-source "windows-sys" "0.48.0"
+                "1aan23v5gs7gya1lc46hqn9mdh8yph3fhxmhxlw36pn6pqc28zb7"))
+
+(define rust-windows-sys-0.59.0
+  ;; TODO: Check bundled sources.
+  (crate-source "windows-sys" "0.59.0"
+                "0fw5672ziw8b3zpmnbp9pdv1famk74f1l9fcbc3zsrzdg56vqf0y"))
+
+(define rust-windows-targets-0.48.5
+  (crate-source "windows-targets" "0.48.5"
+                "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws"))
+
+(define rust-windows-targets-0.52.6
+  (crate-source "windows-targets" "0.52.6"
+                "0wwrx625nwlfp7k93r2rra568gad1mwd888h1jwnl0vfg5r4ywlv"))
+
+(define rust-windows-x86-64-gnu-0.48.5
+  (crate-source "windows_x86_64_gnu" "0.48.5"
+                "13kiqqcvz2vnyxzydjh73hwgigsdr2z1xpzx313kxll34nyhmm2k"))
+
+(define rust-windows-x86-64-gnu-0.52.6
+  (crate-source "windows_x86_64_gnu" "0.52.6"
+                "0y0sifqcb56a56mvn7xjgs8g43p33mfqkd8wj1yhrgxzma05qyhl"))
+
+(define rust-windows-x86-64-gnullvm-0.48.5
+  (crate-source "windows_x86_64_gnullvm" "0.48.5"
+                "1k24810wfbgz8k48c2yknqjmiigmql6kk3knmddkv8k8g1v54yqb"))
+
+(define rust-windows-x86-64-gnullvm-0.52.6
+  (crate-source "windows_x86_64_gnullvm" "0.52.6"
+                "03gda7zjx1qh8k9nnlgb7m3w3s1xkysg55hkd1wjch8pqhyv5m94"))
+
+(define rust-windows-x86-64-msvc-0.48.5
+  (crate-source "windows_x86_64_msvc" "0.48.5"
+                "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d"))
+
+(define rust-windows-x86-64-msvc-0.52.6
+  (crate-source "windows_x86_64_msvc" "0.52.6"
+                "1v7rb5cibyzx8vak29pdrk8nx9hycsjs4w0jgms08qk49jl6v7sq"))
+
+(define rust-winnow-0.6.20
+  (crate-source "winnow" "0.6.20"
+                "16y4i8z9vh8hazjxg5mvmq0c5i35wlk8rxi5gkq6cn5vlb0zxh9n"))
+
+(define rust-write16-1.0.0
+  (crate-source "write16" "1.0.0"
+                "0dnryvrrbrnl7vvf5vb1zkmwldhjkf2n5znliviam7bm4900z2fi"))
+
+(define rust-writeable-0.5.5
+  (crate-source "writeable" "0.5.5"
+                "0lawr6y0bwqfyayf3z8zmqlhpnzhdx0ahs54isacbhyjwa7g778y"))
+
+(define rust-yansi-1.0.1
+  (crate-source "yansi" "1.0.1"
+                "0jdh55jyv0dpd38ij4qh60zglbw9aa8wafqai6m0wa7xaxk3mrfg"))
+
+(define rust-yoke-0.7.5
+  (crate-source "yoke" "0.7.5"
+                "0h3znzrdmll0a7sglzf9ji0p5iqml11wrj1dypaf6ad6kbpnl3hj"))
+
+(define rust-yoke-derive-0.7.5
+  (crate-source "yoke-derive" "0.7.5"
+                "0m4i4a7gy826bfvnqa9wy6sp90qf0as3wps3wb0smjaamn68g013"))
+
+(define rust-zerofrom-0.1.5
+  (crate-source "zerofrom" "0.1.5"
+                "0bnd8vjcllzrvr3wvn8x14k2hkrpyy1fm3crkn2y3plmr44fxwyg"))
+
+(define rust-zerofrom-derive-0.1.5
+  (crate-source "zerofrom-derive" "0.1.5"
+                "022q55phhb44qbrcfbc48k0b741fl8gnazw3hpmmndbx5ycfspjr"))
+
+(define rust-zerovec-0.10.4
+  (crate-source "zerovec" "0.10.4"
+                "0yghix7n3fjfdppwghknzvx9v8cf826h2qal5nqvy8yzg4yqjaxa"))
+
+(define rust-zerovec-derive-0.10.3
+  (crate-source "zerovec-derive" "0.10.3"
+                "1ik322dys6wnap5d3gcsn09azmssq466xryn5czfm13mn7gsdbvf"))
+
+(define rust-vhdl-lang-macros-0.83.1
+  (crate-source "vhdl_lang_macros" "0.83.1"
+                "186l183yqhnf42m8bpzmj189zzsrklrzvh4a0z3hzfdhsg221cb5"))
+
+(define rust-vhdl-lang-0.83.1
+  (crate-source "vhdl_lang" "0.83.1"
+                "0l4n9pbja1vwpvcmz3b4darlm90vvyhjkpp09qx6zh1bqp8w3za6"))
+
+(define ssss-separator 'end-of-crates)
+
+
+;;;
+;;; Cargo inputs.
+;;;
+(define-cargo-inputs lookup-cargo-inputs
+                     (vhdl-ls =>
+                              (list rust-vhdl-lang-0.83.1
+                                    rust-vhdl-lang-macros-0.83.1
+                                    rust-aho-corasick-1.1.3
+                                    rust-anstream-0.6.18
+                                    rust-anstyle-1.0.10
+                                    rust-anstyle-parse-0.2.6
+                                    rust-anstyle-query-1.1.2
+                                    rust-anstyle-wincon-3.0.6
+                                    rust-assert-cmd-2.0.16
+                                    rust-assert-matches-1.5.0
+                                    rust-autocfg-1.4.0
+                                    rust-bitflags-1.3.2
+                                    rust-bitflags-2.6.0
+                                    rust-brunch-0.8.0
+                                    rust-bstr-1.11.0
+                                    rust-cfg-if-1.0.0
+                                    rust-clap-4.5.23
+                                    rust-clap-builder-4.5.23
+                                    rust-clap-derive-4.5.18
+                                    rust-clap-lex-0.7.4
+                                    rust-colorchoice-1.0.3
+                                    rust-crossbeam-channel-0.5.13
+                                    rust-crossbeam-deque-0.8.5
+                                    rust-crossbeam-epoch-0.9.18
+                                    rust-crossbeam-utils-0.8.20
+                                    rust-dactyl-0.9.0
+                                    rust-diff-0.1.13
+                                    rust-difflib-0.4.0
+                                    rust-dirs-5.0.1
+                                    rust-dirs-sys-0.4.1
+                                    rust-displaydoc-0.2.5
+                                    rust-doc-comment-0.3.3
+                                    rust-dunce-1.0.5
+                                    rust-either-1.13.0
+                                    rust-enum-map-2.7.3
+                                    rust-enum-map-derive-0.17.0
+                                    rust-env-filter-0.1.2
+                                    rust-env-logger-0.11.5
+                                    rust-equivalent-1.0.1
+                                    rust-errno-0.3.10
+                                    rust-fastrand-2.3.0
+                                    rust-float-cmp-0.9.0
+                                    rust-fnv-1.0.7
+                                    rust-form-urlencoded-1.2.1
+                                    rust-fuzzy-matcher-0.3.7
+                                    rust-getrandom-0.2.15
+                                    rust-glob-0.3.1
+                                    rust-hashbrown-0.15.2
+                                    rust-heck-0.5.0
+                                    rust-humantime-2.1.0
+                                    rust-icu-collections-1.5.0
+                                    rust-icu-locid-1.5.0
+                                    rust-icu-locid-transform-1.5.0
+                                    rust-icu-locid-transform-data-1.5.0
+                                    rust-icu-normalizer-1.5.0
+                                    rust-icu-normalizer-data-1.5.0
+                                    rust-icu-properties-1.5.1
+                                    rust-icu-properties-data-1.5.0
+                                    rust-icu-provider-1.5.0
+                                    rust-icu-provider-macros-1.5.0
+                                    rust-idna-1.0.3
+                                    rust-idna-adapter-1.2.0
+                                    rust-indexmap-2.7.0
+                                    rust-is-terminal-polyfill-1.70.1
+                                    rust-itertools-0.13.0
+                                    rust-itoa-1.0.14
+                                    rust-libc-0.2.167
+                                    rust-libredox-0.1.3
+                                    rust-linux-raw-sys-0.4.14
+                                    rust-litemap-0.7.4
+                                    rust-lock-api-0.4.12
+                                    rust-log-0.4.22
+                                    rust-lsp-server-0.7.7
+                                    rust-lsp-types-0.95.1
+                                    rust-memchr-2.7.4
+                                    rust-normalize-line-endings-0.3.0
+                                    rust-num-traits-0.2.19
+                                    rust-once-cell-1.20.2
+                                    rust-option-ext-0.2.0
+                                    rust-pad-0.1.6
+                                    rust-parking-lot-0.12.3
+                                    rust-parking-lot-core-0.9.10
+                                    rust-percent-encoding-2.3.1
+                                    rust-pinned-vec-0.1.1
+                                    rust-predicates-3.1.2
+                                    rust-predicates-core-1.0.8
+                                    rust-predicates-tree-1.0.11
+                                    rust-pretty-assertions-1.4.1
+                                    rust-proc-macro2-1.0.92
+                                    rust-quote-1.0.37
+                                    rust-rayon-1.10.0
+                                    rust-rayon-core-1.12.1
+                                    rust-redox-syscall-0.5.7
+                                    rust-redox-users-0.4.6
+                                    rust-regex-1.11.1
+                                    rust-regex-automata-0.4.9
+                                    rust-regex-syntax-0.8.5
+                                    rust-rustix-0.38.42
+                                    rust-rustversion-1.0.18
+                                    rust-ryu-1.0.18
+                                    rust-scopeguard-1.2.0
+                                    rust-serde-1.0.215
+                                    rust-serde-derive-1.0.215
+                                    rust-serde-json-1.0.133
+                                    rust-serde-repr-0.1.19
+                                    rust-serde-spanned-0.6.8
+                                    rust-smallvec-1.13.2
+                                    rust-stable-deref-trait-1.2.0
+                                    rust-strsim-0.11.1
+                                    rust-strum-0.26.3
+                                    rust-strum-macros-0.26.4
+                                    rust-subst-0.3.5
+                                    rust-syn-2.0.90
+                                    rust-synstructure-0.13.1
+                                    rust-tempfile-3.14.0
+                                    rust-termtree-0.4.1
+                                    rust-thiserror-1.0.69
+                                    rust-thiserror-impl-1.0.69
+                                    rust-thread-local-1.1.8
+                                    rust-tinystr-0.7.6
+                                    rust-toml-0.8.19
+                                    rust-toml-datetime-0.6.8
+                                    rust-toml-edit-0.22.22
+                                    rust-unicode-ident-1.0.14
+                                    rust-unicode-width-0.1.14
+                                    rust-unicode-width-0.2.0
+                                    rust-url-2.5.4
+                                    rust-utf16-iter-1.0.5
+                                    rust-utf8-iter-1.0.4
+                                    rust-utf8parse-0.2.2
+                                    rust-wait-timeout-0.2.0
+                                    rust-wasi-0.11.0+wasi-snapshot-preview1
+                                    rust-windows-sys-0.48.0
+                                    rust-windows-sys-0.59.0
+                                    rust-windows-targets-0.48.5
+                                    rust-windows-targets-0.52.6
+                                    rust-windows-aarch64-gnullvm-0.48.5
+                                    rust-windows-aarch64-gnullvm-0.52.6
+                                    rust-windows-aarch64-msvc-0.48.5
+                                    rust-windows-aarch64-msvc-0.52.6
+                                    rust-windows-i686-gnu-0.48.5
+                                    rust-windows-i686-gnu-0.52.6
+                                    rust-windows-i686-gnullvm-0.52.6
+                                    rust-windows-i686-msvc-0.48.5
+                                    rust-windows-i686-msvc-0.52.6
+                                    rust-windows-x86-64-gnu-0.48.5
+                                    rust-windows-x86-64-gnu-0.52.6
+                                    rust-windows-x86-64-gnullvm-0.48.5
+                                    rust-windows-x86-64-gnullvm-0.52.6
+                                    rust-windows-x86-64-msvc-0.48.5
+                                    rust-windows-x86-64-msvc-0.52.6
+                                    rust-winnow-0.6.20
+                                    rust-write16-1.0.0
+                                    rust-writeable-0.5.5
+                                    rust-yansi-1.0.1
+                                    rust-yoke-0.7.5
+                                    rust-yoke-derive-0.7.5
+                                    rust-zerofrom-0.1.5
+                                    rust-zerofrom-derive-0.1.5
+                                    rust-zerovec-0.10.4
+                                    rust-zerovec-derive-0.10.3)))
diff --git a/modules/ruther/packages/vhdl-ls.scm b/modules/ruther/packages/vhdl-ls.scm
index 03e4af1..8132f42 100644
--- a/modules/ruther/packages/vhdl-ls.scm
+++ b/modules/ruther/packages/vhdl-ls.scm
@@ -1,4 +1,6 @@
 (define-module (ruther packages vhdl-ls)
+  #:use-module (ruther packages rust-crates)
+
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
 
@@ -13,290 +15,6 @@
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows))
 
-(define-public rust-skiplist-0.4
-  (package
-    (name "rust-skiplist")
-    (version "0.4.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "skiplist" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0ny9qjxd22090clhvbf1mlnx9k1ncvqmbzis25fpc2a65dx38dzs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-rand" ,rust-rand-0.8))))
-    (home-page "https://www.jpellis.me/projects/rust-skiplist/")
-    (synopsis
-     "Skiplist implementation in rust, providing fast insertion and removal.  A normal skiplist is implemented, as well as an ordered skiplist and a skipmap")
-    (description
-     "This package provides Skiplist implementation in rust, providing fast insertion and removal.  A normal
-skiplist is implemented, as well as an ordered skiplist and a skipmap.")
-    (license license:expat)))
-
-(define-public rust-float-extras-0.1
-  (package
-    (name "rust-float-extras")
-    (version "0.1.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "float_extras" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0ymb731vf7qdvw20spxavy1a8k8f9fb6v8ziamck38lyckw70axj"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
-    (home-page "https://github.com/yjh0502/float_extras")
-    (synopsis "Extra floating-point math functions from C math library")
-    (description
-     "This package provides Extra floating-point math functions from C math library.")
-    (license license:asl2.0)))
-
-(define-public rust-quantogram-0.4
-  (package
-    (name "rust-quantogram")
-    (version "0.4.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "quantogram" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0hxk6ns7fhxbg0mcblkxkq7f534w5n5rmrnapl5887b6i5pizmkp"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-float-extras" ,rust-float-extras-0.1)
-                       ("rust-skiplist" ,rust-skiplist-0.4))))
-    (home-page "https://github.com/paulchernoch/quantogram/")
-    (synopsis
-     "Approximate quantiles using histograms with logarithmically sized bins to guarantee worst case absolute relative error")
-    (description
-     "This package provides Approximate quantiles using histograms with logarithmically sized bins to
-guarantee worst case absolute relative error.")
-    (license #f)))
-
-(define-public rust-dactyl-0.7
-  (package
-    (name "rust-dactyl")
-    (version "0.7.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "dactyl" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0jdhmcxjr70q690xb19asnpv1vffv5m462glrzk6ncxijjmx3jky"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t))
-    (home-page "https://github.com/Blobfolio/dactyl")
-    (synopsis
-     "small library to quickly stringify integers with basic formatting.")
-    (description
-     "This package provides a small library to quickly stringify integers with basic
-formatting.")
-    (license license:wtfpl2)))
-
-(define-public rust-brunch-0.5
-  (package
-    (name "rust-brunch")
-    (version "0.5.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "brunch" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1ranrp9qqmq8z2qkwdwxc67sl1w6mjk3kr7711xmrlw5v48dfcir"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-dactyl" ,rust-dactyl-0.7)
-                       ("rust-unicode-width" ,rust-unicode-width-0.1))
-       #:cargo-development-inputs (("rust-quantogram" ,rust-quantogram-0.4))))
-    (home-page "https://github.com/Blobfolio/brunch")
-    (synopsis "simple micro-benchmark runner.")
-    (description "This package provides a simple micro-benchmark runner.")
-    (license license:wtfpl2)))
-
-(define-public rust-vhdl-lang-macros-0.83
-  (package
-    (name "rust-vhdl-lang-macros")
-    (version "0.83.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "vhdl_lang_macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "186l183yqhnf42m8bpzmj189zzsrklrzvh4a0z3hzfdhsg221cb5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-2))))
-    (home-page "https://github.com/kraigher/rust_hdl")
-    (synopsis "VHDL Language Frontend - Macros")
-    (description "This package provides VHDL Language Frontend - Macros.")
-    (license license:mpl2.0)))
-
-(define-public rust-serde-yaml-0.9
-  (package
-    (name "rust-serde-yaml")
-    (version "0.9.34+deprecated")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "serde_yaml" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0isba1fjyg3l6rxk156k600ilzr8fp7crv82rhal0rxz5qd1m2va"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-indexmap" ,rust-indexmap-2)
-                       ("rust-itoa" ,rust-itoa-1)
-                       ("rust-ryu" ,rust-ryu-1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-unsafe-libyaml" ,rust-unsafe-libyaml-0.2))))
-    (home-page "https://github.com/dtolnay/serde-yaml")
-    (synopsis "YAML data format for Serde")
-    (description "This package provides YAML data format for Serde.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-subst-0.3
-  (package
-    (name "rust-subst")
-    (version "0.3.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "subst" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "038n81ns4b8ncjynhif7wq474023chg5mwccxw0xn6gaflk99rrk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-indexmap" ,rust-indexmap-2)
-                       ("rust-memchr" ,rust-memchr-2)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-serde-yaml" ,rust-serde-yaml-0.9)
-                       ("rust-toml" ,rust-toml-0.8)
-                       ("rust-unicode-width" ,rust-unicode-width-0.1))))
-    (home-page "https://github.com/fizyr/subst")
-    (synopsis "shell-like variable substitution")
-    (description "This package provides shell-like variable substitution.")
-    (license (list license:bsd-2 license:asl2.0))))
-
-(define-public rust-pinned-vec-0.1
-  (package
-    (name "rust-pinned-vec")
-    (version "0.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "pinned_vec" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "12il2y234k9r4i3v9yh7qpavrwdhi48b057z96hb0bv2j8nxi2i6"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t))
-    (home-page "https://github.com/wishawa/decurse")
-    (synopsis "Vec-like data structure whose elements never move")
-    (description
-     "This package provides Vec-like data structure whose elements never move.")
-    (license license:mpl2.0)))
-
-(define-public rust-enum-map-derive-0.17
-  (package
-    (name "rust-enum-map-derive")
-    (version "0.17.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "enum-map-derive" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sv4mb343rsz4lc3rh7cyn0pdhf7fk18k1dgq8kfn5i5x7gwz0pj"))))
-    (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-2))))
-    (home-page "https://codeberg.org/xfix/enum-map")
-    (synopsis "Macros 1.1 implementation of #[derive(Enum)]")
-    (description
-     "This package provides Macros 1.1 implementation of #[derive(Enum)].")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-enum-map-2
-  (package
-    (name "rust-enum-map")
-    (version "2.7.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "enum-map" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1sgjgl4mmz93jdkfdsmapc3dmaq8gddagw9s0fd501w2vyzz6rk8"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
-                       ("rust-enum-map-derive" ,rust-enum-map-derive-0.17)
-                       ("rust-serde" ,rust-serde-1))))
-    (home-page "https://codeberg.org/xfix/enum-map")
-    (synopsis "map with C-like enum keys represented internally as an array")
-    (description
-     "This package provides a map with C-like enum keys represented internally as an
-array.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-vhdl-lang-0.83
-  (package
-    (name "rust-vhdl-lang")
-    (version "0.83.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "vhdl_lang" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0l4n9pbja1vwpvcmz3b4darlm90vvyhjkpp09qx6zh1bqp8w3za6"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-clap" ,rust-clap-4)
-                       ("rust-dirs" ,rust-dirs-5)
-                       ("rust-dunce" ,rust-dunce-1)
-                       ("rust-enum-map" ,rust-enum-map-2)
-                       ("rust-fnv" ,rust-fnv-1)
-                       ("rust-glob" ,rust-glob-0.2)
-                       ("rust-itertools" ,rust-itertools-0.5)
-                       ("rust-pad" ,rust-pad-0.1)
-                       ("rust-parking-lot" ,rust-parking-lot-0.4)
-                       ("rust-pinned-vec" ,rust-pinned-vec-0.1)
-                       ("rust-rayon" ,rust-rayon-1)
-                       ("rust-strum" ,rust-strum-0.26)
-                       ("rust-subst" ,rust-subst-0.3)
-                       ("rust-toml" ,rust-toml-0.4)
-                       ("rust-vhdl-lang-macros" ,rust-vhdl-lang-macros-0.83))))
-    (home-page "https://github.com/kraigher/rust_hdl")
-    (synopsis "VHDL Language Frontend")
-    (description "This package provides VHDL Language Frontend.")
-    (license license:mpl2.0)))
-
-
 (define-public vhdl-ls
   (package
     (name "vhdl-ls")
@@ -314,6 +32,8 @@ array.")
        (sha256
         (base32 "0fs8qghnxw82by8dmlxlvm2spzqq3rk8aywj1ay7jxzwblkpkvq0"))))
     (build-system cargo-build-system)
+    (inputs
+     (my-cargo-inputs 'vhdl-ls))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -326,17 +46,6 @@ array.")
                (mkdir-p (string-append out "/share/vhdl_libraries"))
                (copy-recursively "vhdl_libraries"
                                  (string-append out "/share/vhdl_libraries"))))))
-       #:cargo-inputs
-       (("rust-clap" ,rust-clap-4)
-        ("rust-env-logger" ,rust-env-logger-0.3)
-        ("rust-fnv" ,rust-fnv-1)
-        ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
-        ("rust-log" ,rust-log-0.3)
-        ("rust-lsp-server" ,rust-lsp-server-0.7)
-        ("rust-lsp-types" ,rust-lsp-types-0.95)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-vhdl-lang" ,rust-vhdl-lang-0.83))
        #:cargo-build-flags
        (list
         "--release" "--package" "vhdl_ls")
@@ -347,15 +56,7 @@ array.")
        #:cargo-test-flags
        (list
         "--release"
-        "--package" "vhdl_ls")
-       #:cargo-development-inputs
-       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-brunch" ,rust-brunch-0.5)
-        ("rust-assert-cmd" ,rust-assert-cmd-2)
-        ("rust-assert-matches" ,rust-assert-matches-1)
-        ("rust-predicates" ,rust-predicates-3)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
+        "--package" "vhdl_ls")))
     (home-page "https://github.com/kraigher/rust_hdl")
     (synopsis "VHDL Language Server")
     (description "This package provides VHDL Language Server.")
-- 
2.49.0