From 5c8bde597597cf79a9bfd673de9e5fbd3287af3c Mon Sep 17 00:00:00 2001 From: Danylo Kondratiev Date: Thu, 26 Mar 2026 18:53:16 +0200 Subject: [PATCH] gnu: tokei: Update to 14.0.0. * gnu/packages/rust-apps.scm (tokei): Update to 14.0.0. [arguments]: Add cargo-test-flags. [inputs]: Remove libgit2, add libgit2-1.8. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Update entry for tokei. Change-Id: I979d4035081196bfd268fed939fc6f8d566bd76f Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 18 +- gnu/packages/rust-crates.scm | 359 +++++++++++++++++++++-------------- 2 files changed, 230 insertions(+), 147 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index db0f263264..bf791aab39 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -3431,21 +3431,25 @@ colorized view to stdout.") (define-public tokei (package (name "tokei") - (version "12.1.2") + (version "14.0.0") (source (origin (method url-fetch) (uri (crate-uri "tokei" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) + (base32 "15v7ha13w4zrr2a6vlrj641qcrczvyjhvnqf147g64n3q1spipp4")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f)) - (native-inputs - (list pkg-config)) - (inputs - (cons* libgit2 openssl zlib (cargo-inputs 'tokei))) + `(#:cargo-test-flags + '("--" + ;; Tests directory not included in release. + "--skip=language::language_type::tests::lf_embedded_language_is_counted" + "--skip=language::language_type::tests::jupyter_notebook_has_correct_totals") + #:install-source? #f)) + (native-inputs (list pkg-config)) + (inputs (cons* libgit2-1.8 openssl zlib + (cargo-inputs 'tokei))) (home-page "https://tokei.rs") (synopsis "Count code, quickly") (description diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 6bc899e247..743a64de63 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -4092,6 +4092,10 @@ (crate-source "clap-cargo" "0.15.2" "1rai72khjaj16b5751b8kjipnxl54bj4pdg93kda9gzj9zlg0inm")) +(define rust-clap-cargo-0.18.3 + (crate-source "clap-cargo" "0.18.3" + "01l070c3a88spywm8drhfzwn3ljp142fqsi1p15pan42bj9m2rck")) + (define rust-clap-complete-3.2.5 (crate-source "clap_complete" "3.2.5" "1n3whjkznszrxif1hzvql7hav7agq85j456fmwjwwi9cjq52wyiz")) @@ -7397,6 +7401,10 @@ (crate-source "env_filter" "1.0.0" "13rhwy5arjn626a0z3hvvkpf9w9pnll14c35vscyqx3jwp43q73s")) +(define rust-env-filter-1.0.1 + (crate-source "env_filter" "1.0.1" + "1vvf9xhaxm0m78bp23b8j3cbv1vm5vffn3gaas27mc64rhm0rs9j")) + (define rust-env-flags-0.1.1 (crate-source "env-flags" "0.1.1" "05f4537d68a0wg9iy3kj77hb8xcrkyy2fsirr7kcbpijqrzhxzfv")) @@ -7409,6 +7417,10 @@ (crate-source "env_logger" "0.10.2" "1005v71kay9kbz1d5907l0y7vh9qn2fqsp2yfgb8bjvin6m0bm2c")) +(define rust-env-logger-0.11.10 + (crate-source "env_logger" "0.11.10" + "0smmk1hqzk7z91rg7fdq98d03gh9kidkd0ymim43zb4n457w0886")) + (define rust-env-logger-0.11.5 (crate-source "env_logger" "0.11.5" "13812wq68kybv2vj6rpnhbl7ammlhggcb7vq68bkichzp4cscgz1")) @@ -20749,6 +20761,10 @@ (crate-source "proptest" "1.10.0" "0ch5r381al5z7089j47gkyybzbgygkgld5bzfg019vxcznrnqmip")) +(define rust-proptest-1.11.0 + (crate-source "proptest" "1.11.0" + "0i27rr5drw4ic8hjzx6i1c6q8s7kmsgpfmzy4m80ys2c6k1gqiab")) + (define rust-proptest-1.6.0 (crate-source "proptest" "1.6.0" "0l4y4bb8hffv7cys7d59qwqdmvmqjfzz0x9vblc08209clqfkjhl")) @@ -26739,6 +26755,10 @@ (crate-source "systemstat" "0.2.5" "0cr05p9zm0y3gsyadnmv4jyln7my3dkqkmmchjqnzcj49lcga8ah")) +(define rust-table-formatter-0.6.1 + (crate-source "table_formatter" "0.6.1" + "0zf1080zzscg2jwrzbkzgwr97vlsdbg4js1884fr2b27slzmvvxy")) + (define rust-tabled-0.17.0 (crate-source "tabled" "0.17.0" "02ji1rhr6kig7mhh3zlwbflqghadav6mj1g5gi13fccpyci94w66")) @@ -27009,6 +27029,10 @@ (crate-source "terminal_size" "0.4.3" "1l7cicmz49c0cyskfp5a389rsai649xi7y032v73475ikjbwpf30")) +(define rust-terminal-size-0.4.4 + (crate-source "terminal_size" "0.4.4" + "0x4839vhhpzacc42rqj2wjhivlhlggzz3890b0c5pmyb3j11n2i3")) + (define rust-terminal-trx-0.2.4 (crate-source "terminal-trx" "0.2.4" "1ask2zj8q78rh50wylcc60z78g35c4nb4lsydm2h46zsmqrl4nwp")) @@ -29323,6 +29347,10 @@ (crate-source "unicode-segmentation" "1.13.1" "0nq2v5daqvzpxfgz1lm2g23jkj4j6f03j1zyzz6br12lh2d0hdns")) +(define rust-unicode-segmentation-1.13.2 + (crate-source "unicode-segmentation" "1.13.2" + "135a26m4a0wj319gcw28j6a5aqvz00jmgwgmcs6szgxjf942facn")) + (define rust-unicode-truncate-1.1.0 (crate-source "unicode-truncate" "1.1.0" "1gr7arjjhrhy8dww7hj8qqlws97xf9d276svr4hs6pxgllklcr5k")) @@ -80640,210 +80668,261 @@ rust-zerovec-0.10.4 rust-zerovec-derive-0.10.3)) (tokei => - (list rust-aho-corasick-0.7.20 - rust-aho-corasick-1.1.3 - rust-android-tzdata-0.1.1 + (list rust-aho-corasick-1.1.4 rust-android-system-properties-0.1.5 - rust-ansi-term-0.12.1 + rust-anstream-1.0.0 + rust-anstyle-1.0.14 + rust-anstyle-parse-1.0.0 + rust-anstyle-query-1.1.5 + rust-anstyle-wincon-3.0.11 + rust-anyhow-1.0.102 + rust-arbitrary-1.4.2 rust-arrayvec-0.7.6 - rust-atty-0.2.14 - rust-autocfg-1.4.0 - rust-bitflags-1.3.2 - rust-bitflags-2.9.0 + rust-autocfg-1.5.0 + rust-bit-set-0.8.0 + rust-bit-vec-0.8.0 + rust-bitflags-2.11.0 rust-block-buffer-0.10.4 - rust-bstr-1.12.0 - rust-bumpalo-3.17.0 - rust-cc-1.2.19 - rust-cfg-if-1.0.0 - rust-chrono-0.4.40 + rust-bstr-1.12.1 + rust-bumpalo-3.20.2 + rust-cc-1.2.57 + rust-cfg-if-1.0.4 + rust-chrono-0.4.44 rust-chrono-tz-0.9.0 rust-chrono-tz-build-0.3.0 - rust-clap-2.34.0 + rust-clap-4.6.0 + rust-clap-cargo-0.18.3 + rust-clap-builder-4.6.0 + rust-clap-derive-4.6.0 + rust-clap-lex-1.1.0 + rust-colorchoice-1.0.5 + rust-colored-2.2.0 rust-core-foundation-sys-0.8.7 rust-cpufeatures-0.2.17 rust-crossbeam-channel-0.5.15 rust-crossbeam-deque-0.8.6 rust-crossbeam-epoch-0.9.18 rust-crossbeam-utils-0.8.21 - rust-crypto-common-0.1.6 - rust-dashmap-4.0.2 - rust-deunicode-1.6.1 + rust-crypto-common-0.1.7 + rust-dashmap-6.1.0 + rust-derive-arbitrary-1.4.2 + rust-deunicode-1.6.2 rust-digest-0.10.7 - rust-dirs-3.0.2 - rust-dirs-sys-0.3.7 rust-displaydoc-0.2.5 rust-either-1.15.0 rust-encoding-rs-0.8.35 rust-encoding-rs-io-0.1.7 - rust-env-logger-0.8.4 - rust-errno-0.3.11 + rust-env-filter-1.0.1 + rust-env-logger-0.11.10 + rust-equivalent-1.0.2 + rust-errno-0.3.14 + rust-etcetera-0.8.0 rust-fastrand-2.3.0 - rust-form-urlencoded-1.2.1 + rust-find-msvc-tools-0.1.9 + rust-fnv-1.0.7 + rust-foldhash-0.1.5 + rust-form-urlencoded-1.2.2 rust-generic-array-0.14.7 - rust-getrandom-0.2.15 - rust-getrandom-0.3.2 - rust-git2-0.13.25 - rust-globset-0.4.16 + rust-getrandom-0.2.17 + rust-getrandom-0.3.4 + rust-getrandom-0.4.2 + rust-git2-0.19.0 + rust-globset-0.4.18 rust-globwalk-0.9.1 - rust-grep-matcher-0.1.7 - rust-grep-searcher-0.1.14 + rust-grep-matcher-0.1.8 + rust-grep-searcher-0.1.16 rust-half-1.8.3 - rust-hashbrown-0.12.3 - rust-hermit-abi-0.1.19 - rust-hermit-abi-0.3.9 + rust-hashbrown-0.14.5 + rust-hashbrown-0.15.5 + rust-hashbrown-0.16.1 + rust-heck-0.5.0 rust-hex-0.4.3 + rust-home-0.5.12 rust-humansize-2.1.3 - rust-humantime-2.2.0 - rust-iana-time-zone-0.1.63 + rust-iana-time-zone-0.1.65 rust-iana-time-zone-haiku-0.1.2 - 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.1 - rust-icu-normalizer-1.5.0 - rust-icu-normalizer-data-1.5.1 - rust-icu-properties-1.5.1 - rust-icu-properties-data-1.5.1 - 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-ignore-0.4.23 - rust-indexmap-1.9.3 - rust-instant-0.1.13 - rust-itoa-1.0.15 - rust-jobserver-0.1.33 - rust-js-sys-0.3.77 + rust-icu-collections-2.1.1 + rust-icu-locale-core-2.1.1 + rust-icu-normalizer-2.1.1 + rust-icu-normalizer-data-2.1.1 + rust-icu-properties-2.1.2 + rust-icu-properties-data-2.1.2 + rust-icu-provider-2.1.1 + rust-id-arena-2.3.0 + rust-idna-1.1.0 + rust-idna-adapter-1.2.1 + rust-ignore-0.4.25 + rust-indexmap-2.13.0 + rust-is-terminal-polyfill-1.70.2 + rust-itertools-0.11.0 + rust-itoa-1.0.18 + rust-jiff-0.2.23 + rust-jiff-static-0.2.23 + rust-jobserver-0.1.34 + rust-js-sys-0.3.91 + rust-json5-0.4.1 rust-lazy-static-1.5.0 - rust-libc-0.2.172 - rust-libgit2-sys-0.12.26+1.3.0 - rust-libm-0.2.11 - rust-libredox-0.1.3 - rust-libz-sys-1.1.22 - rust-linked-hash-map-0.5.6 - rust-linux-raw-sys-0.9.4 - rust-litemap-0.7.5 - rust-lock-api-0.4.12 - rust-log-0.4.27 - rust-memchr-2.7.4 - rust-memmap2-0.9.5 + rust-leb128fmt-0.1.0 + rust-libc-0.2.183 + rust-libgit2-sys-0.17.0+1.8.1 + rust-libm-0.2.16 + rust-libz-sys-1.1.25 + rust-linux-raw-sys-0.12.1 + rust-litemap-0.8.1 + rust-lock-api-0.4.14 + rust-log-0.4.29 + rust-memchr-2.8.0 + rust-memmap2-0.9.10 rust-num-format-0.4.4 rust-num-traits-0.2.19 - rust-num-cpus-1.16.0 - rust-once-cell-1.21.3 - rust-parking-lot-0.11.2 - rust-parking-lot-core-0.8.6 + rust-once-cell-1.21.4 + rust-once-cell-polyfill-1.70.2 + rust-parking-lot-0.12.5 + rust-parking-lot-core-0.9.12 rust-parse-zoneinfo-0.3.1 - rust-percent-encoding-2.3.1 - rust-pest-2.8.0 - rust-pest-derive-2.8.0 - rust-pest-generator-2.8.0 - rust-pest-meta-2.8.0 + rust-percent-encoding-2.3.2 + rust-pest-2.8.6 + rust-pest-derive-2.8.6 + rust-pest-generator-2.8.6 + rust-pest-meta-2.8.6 rust-phf-0.11.3 rust-phf-codegen-0.11.3 rust-phf-generator-0.11.3 rust-phf-shared-0.11.3 rust-pkg-config-0.3.32 + rust-portable-atomic-1.13.1 + rust-portable-atomic-util-0.2.6 + rust-potential-utf-0.1.4 rust-ppv-lite86-0.2.21 - rust-proc-macro2-1.0.95 - rust-quote-1.0.40 - rust-r-efi-5.2.0 + rust-prettyplease-0.2.37 + rust-proc-macro2-1.0.106 + rust-proptest-1.11.0 + rust-quick-error-1.2.3 + rust-quote-1.0.45 + rust-r-efi-5.3.0 + rust-r-efi-6.0.0 rust-rand-0.8.5 + rust-rand-0.9.2 rust-rand-chacha-0.3.1 + rust-rand-chacha-0.9.0 rust-rand-core-0.6.4 - rust-rayon-1.10.0 - rust-rayon-core-1.12.1 - rust-redox-syscall-0.2.16 - 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-1.0.5 - rust-rustversion-1.0.20 - rust-ryu-1.0.20 + rust-rand-core-0.9.5 + rust-rand-xorshift-0.4.0 + rust-rayon-1.11.0 + rust-rayon-core-1.13.0 + rust-redox-syscall-0.5.18 + rust-regex-1.12.3 + rust-regex-automata-0.4.14 + rust-regex-syntax-0.8.10 + rust-rustix-1.1.4 + rust-rustversion-1.0.22 + rust-rusty-fork-0.3.1 + rust-ryu-1.0.23 rust-same-file-1.0.6 rust-scopeguard-1.2.0 - rust-serde-1.0.219 + rust-semver-1.0.27 + rust-serde-1.0.228 rust-serde-cbor-0.11.2 - rust-serde-derive-1.0.219 - rust-serde-json-1.0.140 - rust-serde-yaml-0.8.26 - rust-sha2-0.10.8 + rust-serde-core-1.0.228 + rust-serde-derive-1.0.228 + rust-serde-json-1.0.149 + rust-serde-spanned-0.6.9 + rust-serde-yaml-0.9.34+deprecated + rust-sha2-0.10.9 rust-shlex-1.3.0 - rust-siphasher-1.0.1 + rust-siphasher-1.0.2 rust-slug-0.1.6 - rust-smallvec-1.15.0 - rust-stable-deref-trait-1.2.0 - rust-strsim-0.8.0 - rust-syn-2.0.100 - rust-synstructure-0.13.1 - rust-tempfile-3.19.1 - rust-tera-1.20.0 + rust-smallvec-1.15.1 + rust-stable-deref-trait-1.2.1 + rust-strsim-0.11.1 + rust-strum-0.26.3 + rust-strum-macros-0.26.4 + rust-syn-2.0.117 + rust-synstructure-0.13.2 + rust-table-formatter-0.6.1 + rust-tempfile-3.27.0 + rust-tera-1.20.1 rust-term-size-0.3.2 - rust-termcolor-1.4.1 - rust-textwrap-0.11.0 + rust-terminal-size-0.4.4 rust-thiserror-1.0.69 - rust-thiserror-2.0.12 rust-thiserror-impl-1.0.69 - rust-thiserror-impl-2.0.12 - rust-tinystr-0.7.6 - rust-toml-0.5.11 - rust-typenum-1.18.0 + rust-tinystr-0.8.2 + rust-toml-0.8.23 + rust-toml-datetime-0.6.11 + rust-toml-edit-0.22.27 + rust-toml-write-0.1.2 + rust-typenum-1.19.0 rust-ucd-trie-0.1.7 - rust-unic-char-property-0.9.0 - rust-unic-char-range-0.9.0 - rust-unic-common-0.9.0 - rust-unic-segment-0.9.0 - rust-unic-ucd-segment-0.9.0 - rust-unic-ucd-version-0.9.0 - rust-unicode-ident-1.0.18 - rust-unicode-width-0.1.14 - rust-url-2.5.4 - rust-utf16-iter-1.0.5 + rust-unarray-0.1.4 + rust-unicode-ident-1.0.24 + rust-unicode-segmentation-1.13.2 + rust-unicode-xid-0.2.6 + rust-unsafe-libyaml-0.2.11 + rust-url-2.5.8 rust-utf8-iter-1.0.4 + rust-utf8parse-0.2.2 rust-vcpkg-0.2.15 - rust-vec-map-0.8.2 rust-version-check-0.9.5 + rust-wait-timeout-0.2.1 rust-walkdir-2.5.0 - rust-wasi-0.11.0+wasi-snapshot-preview1 - rust-wasi-0.14.2+wasi-0.2.4 - rust-wasm-bindgen-0.2.100 - rust-wasm-bindgen-backend-0.2.100 - rust-wasm-bindgen-macro-0.2.100 - rust-wasm-bindgen-macro-support-0.2.100 - rust-wasm-bindgen-shared-0.2.100 + rust-wasi-0.11.1+wasi-snapshot-preview1 + rust-wasip2-1.0.2+wasi-0.2.9 + rust-wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06 + rust-wasm-bindgen-0.2.114 + rust-wasm-bindgen-macro-0.2.114 + rust-wasm-bindgen-macro-support-0.2.114 + rust-wasm-bindgen-shared-0.2.114 + rust-wasm-encoder-0.244.0 + rust-wasm-metadata-0.244.0 + rust-wasmparser-0.244.0 rust-winapi-0.3.9 rust-winapi-i686-pc-windows-gnu-0.4.0 - rust-winapi-util-0.1.9 + rust-winapi-util-0.1.11 rust-winapi-x86-64-pc-windows-gnu-0.4.0 - rust-windows-core-0.61.0 - rust-windows-implement-0.60.0 - rust-windows-interface-0.59.1 - rust-windows-link-0.1.1 - rust-windows-result-0.3.2 - rust-windows-strings-0.4.0 + rust-windows-core-0.62.2 + rust-windows-implement-0.60.2 + rust-windows-interface-0.59.3 + rust-windows-link-0.2.1 + rust-windows-result-0.4.1 + rust-windows-strings-0.5.1 + rust-windows-sys-0.48.0 rust-windows-sys-0.59.0 + rust-windows-sys-0.61.2 + 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-wit-bindgen-rt-0.39.0 - rust-write16-1.0.0 - rust-writeable-0.5.5 - rust-yaml-rust-0.4.5 - rust-yoke-0.7.5 - rust-yoke-derive-0.7.5 - rust-zerocopy-0.8.24 - rust-zerocopy-derive-0.8.24 + rust-winnow-0.7.15 + rust-wit-bindgen-0.51.0 + rust-wit-bindgen-core-0.51.0 + rust-wit-bindgen-rust-0.51.0 + rust-wit-bindgen-rust-macro-0.51.0 + rust-wit-component-0.244.0 + rust-wit-parser-0.244.0 + rust-writeable-0.6.2 + rust-yoke-0.8.1 + rust-yoke-derive-0.8.1 + rust-zerocopy-0.8.47 + rust-zerocopy-derive-0.8.47 rust-zerofrom-0.1.6 rust-zerofrom-derive-0.1.6 - rust-zerovec-0.10.4 - rust-zerovec-derive-0.10.3)) + rust-zerotrie-0.2.3 + rust-zerovec-0.11.5 + rust-zerovec-derive-0.11.2 + rust-zmij-1.0.21)) (transanno => (list rust-addr2line-0.24.2 rust-adler2-2.0.0