From e60efabc5d210b2d3c4a7519f2f1ba486ad5354b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 21 Apr 2025 17:48:58 +0800 Subject: [PATCH] gnu: hex: Remove #:cargo-inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rust-apps.scm (hex)[source]: Remove snippet. [inputs]: Use ‘cargo-inputs’. [arguments]: Remove #:cargo-inputs and #:cargo-development-inputs. * gnu/packages/rust-crates.scm (lookup-cargo-inputs)[hex]: New entry. Change-Id: I4780919e3051ff98305b4c143bb0132940c49af4 --- gnu/packages/rust-apps.scm | 14 +----- gnu/packages/rust-crates.scm | 85 ++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 12 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index e150f1ee0ec..4118c67c787 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2606,12 +2606,7 @@ revert and check changes. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kv07ghibifs6rnskg1na6a0hdb0f8vqfbpv5k8g09lc2075gjv1")) - (snippet - #~(begin (use-modules (guix build utils)) - (substitute* "Cargo.toml" - ;; rusty-hook provides a git hook for CI. - ((".*rusty-hook.*") "")))))) + (base32 "0kv07ghibifs6rnskg1na6a0hdb0f8vqfbpv5k8g09lc2075gjv1")))) (build-system cargo-build-system) (arguments `(#:install-source? #f @@ -2623,18 +2618,13 @@ revert and check changes. "--skip=tests::test_cli_input_missing_file" "--skip=tests::test_cli_input_stdin" "--skip=tests::test_cli_missing_param_value") - #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-clap" ,rust-clap-4) - ("rust-no-color" ,rust-no-color-0.1)) - #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-2)) #:phases (modify-phases %standard-phases (add-after 'install 'install-more (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (install-file "hx.1" (string-append out "/share/man/man1")))))))) + (inputs (cargo-inputs 'hex)) (home-page "https://github.com/sitkevij/hex") (synopsis "Hexadecimal colorized view of a file") (description diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 93a4e62144b..1a6595afa90 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -1620,6 +1620,11 @@ (crate-source "chunked_transfer" "1.5.0" "00a9h3csr1xwkqrzpz5kag4h92zdkrnxq4ppxidrhrx29syf6kbf")) +(define rust-ci-info-0.10.2 + (crate-source "ci_info" "0.10.2" + "0pn4lfq630bf6aki3kz41555b4fs8iyc1a69biwm6mwc1v3kixi4" + #:snippet '(delete-file-recursively "docs"))) + (define rust-ciborium-0.2.2 (crate-source "ciborium" "0.2.2" "03hgfw4674im1pdqblcp77m7rc8x2v828si5570ga5q9dzyrzrj2")) @@ -3175,6 +3180,11 @@ (crate-source "env_logger" "0.9.3" "1rq0kqpa8my6i1qcyhfqrn1g9xr5fbkwwbd42nqvlzn9qibncbm1")) +(define rust-envmnt-0.8.4 + (crate-source "envmnt" "0.8.4" + "0na01z737h9yn5y8qj3qjzipirnprgyprbv199632qbw53y2ilx2" + #:snippet '(delete-file-recursively "docs"))) + (define rust-envy-0.4.2 (crate-source "envy" "0.4.2" "0rar459p7pl19v6pbx98q3hi2hxfl8q1ndxxw5d4zd9cgway0irz")) @@ -3592,6 +3602,11 @@ (crate-source "fsevent-sys" "4.1.0" "1liz67v8b0gcs8r31vxkvm2jzgl9p14i78yfqx81c8sdv817mvkn")) +(define rust-fsio-0.1.3 + (crate-source "fsio" "0.1.3" + "1qs9i8blmbaxjl3csibn5sf0w27qf8dz2sgamvqz8fgpamr0izf1" + #:snippet '(delete-file-recursively "docs"))) + (define rust-fsio-0.4.1 (crate-source "fsio" "0.4.1" "1ci5ixcc4z7ik2kxwal8a9gjgfv7d1wb91lrnyrb81baxcb4z57l")) @@ -7295,6 +7310,10 @@ (crate-source "nftables" "0.5.0" "0mz6i4cm5qbc11zdrzghixvml2j9vxdf97nqjbkqc471kvg8hwkc")) +(define rust-nias-0.5.0 + (crate-source "nias" "0.5.0" + "1w0jrshjqr1dxd01kg12f1ic067hvwwqc9jxbf0m063gr11089db")) + (define rust-nibble-vec-0.1.0 (crate-source "nibble_vec" "0.1.0" "0hsdp3s724s30hkqz74ky6sqnadhp2xwcj1n1hzy4vzkz4yxi9bp")) @@ -7360,6 +7379,10 @@ "0ikvn7s9r2lrfdm3mx1h7nbfjvcc6s9vxdzw7j5xfkd2qdnp9qki" #:snippet '(delete-file-recursively "test"))) +(define rust-no-color-0.1.0 + (crate-source "no_color" "0.1.0" + "1m0x6i5q1jav2jgajkg4irrkfgv4lakpdvmj310b90wswdyy9xdx")) + (define rust-no-panic-0.1.26 (crate-source "no-panic" "0.1.26" "0sp4d9815f8vdz31qm10wpnswi0x89hlbzw78nxy0p2g88kd39ki")) @@ -10133,6 +10156,10 @@ (crate-source "rusty-fork" "0.3.0" "0kxwq5c480gg6q0j3bg4zzyfh2kwmc3v2ba94jw8ncjc8mpcqgfb")) +(define rust-rusty-hook-0.11.2 + (crate-source "rusty-hook" "0.11.2" + "18r1mh2br76b6zwkvch01xi9rhj9fknmh7l5vnx1qzmyc6zfkkln")) + (define rust-rustyline-10.1.1 (crate-source "rustyline" "10.1.1" "1vvsd68cch0lpcg6mcwfvfdd6r4cxbwis3bf9443phzkqcr3rs61")) @@ -20659,6 +20686,64 @@ rust-winapi-i686-pc-windows-gnu-0.4.0 rust-winapi-x86-64-pc-windows-gnu-0.4.0 rust-winnow-0.5.15)) + (hex => + (list rust-ansi-term-0.12.1 + 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.7 + rust-assert-cmd-2.0.17 + rust-autocfg-1.4.0 + rust-bstr-1.12.0 + rust-ci-info-0.10.2 + rust-clap-4.5.37 + rust-clap-builder-4.5.37 + rust-clap-lex-0.7.4 + rust-colorchoice-1.0.3 + rust-difflib-0.4.0 + rust-doc-comment-0.3.3 + rust-envmnt-0.8.4 + rust-fsio-0.1.3 + rust-getopts-0.2.21 + rust-hashbrown-0.12.3 + rust-indexmap-1.9.3 + rust-is-terminal-polyfill-1.70.1 + rust-libc-0.2.172 + rust-memchr-2.7.4 + rust-nias-0.5.0 + rust-no-color-0.1.0 + rust-once-cell-1.21.3 + rust-predicates-3.1.3 + rust-predicates-core-1.0.9 + rust-predicates-tree-1.0.12 + rust-proc-macro2-1.0.95 + rust-quote-1.0.40 + rust-regex-automata-0.4.9 + rust-rusty-hook-0.11.2 + rust-serde-1.0.219 + rust-serde-derive-1.0.219 + rust-strsim-0.11.1 + rust-syn-2.0.100 + rust-termtree-0.5.1 + rust-toml-0.5.11 + rust-unicode-ident-1.0.18 + rust-unicode-width-0.1.14 + rust-utf8parse-0.2.2 + rust-wait-timeout-0.2.1 + 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.59.0 + rust-windows-targets-0.52.6 + rust-windows-aarch64-gnullvm-0.52.6 + rust-windows-aarch64-msvc-0.52.6 + rust-windows-i686-gnu-0.52.6 + rust-windows-i686-gnullvm-0.52.6 + rust-windows-i686-msvc-0.52.6 + rust-windows-x86-64-gnu-0.52.6 + rust-windows-x86-64-gnullvm-0.52.6 + rust-windows-x86-64-msvc-0.52.6)) (hexyl => (list rust-aho-corasick-1.1.3 rust-anstream-0.6.18