From c5e879cdbb90c160a19809cc356d3cd617110067 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 25 Jun 2020 01:05:40 +0200 Subject: gnu: crates-io: Remove minor versions from some package names. * gnu/packages/crates-io.scm (rust-termcolor-1.0): Rename to rust-termcolor-1. (rust-humantime-1.3): Rename to rust-humantime-1. (rust-num-cpus-1.11): Rename to rust-num-cpus-1. (rust-signal-hook-registry-1.2): Rename to rust-signal-hook-registry-1. --- gnu/packages/crates-io.scm | 80 +++++++++++++++++++++++----------------------- gnu/packages/rust-apps.scm | 8 ++--- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 317a152123..e0ac6ac403 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -639,7 +639,7 @@ text or blue underlined text, on ANSI terminals.") (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-itertools" ,rust-itertools-0.8) ("rust-model" ,rust-model-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-once-cell" ,rust-once-cell-1.2) ("rust-proptest" ,rust-proptest-0.8) ("rust-version-sync" ,rust-version-sync-0.8)))) @@ -4094,7 +4094,7 @@ intrinsics.") #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)) #:cargo-development-inputs - (("rust-num-cpus" ,rust-num-cpus-1.11) + (("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.6) ("rust-signal-hook" ,rust-signal-hook-0.1)))) (home-page @@ -4126,7 +4126,7 @@ intrinsics.") #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) #:cargo-development-inputs - (("rust-num-cpus" ,rust-num-cpus-1.11) + (("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.6) ("rust-signal-hook" ,rust-signal-hook-0.1)))))) @@ -5984,10 +5984,10 @@ Standard.") `(#:skip-build? #t #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-humantime" ,rust-humantime-1.3) + ("rust-humantime" ,rust-humantime-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) - ("rust-termcolor" ,rust-termcolor-1.0)))) + ("rust-termcolor" ,rust-termcolor-1)))) (home-page "https://github.com/sebasmagri/env_logger/") (synopsis "Logging implementation for @code{log}") (description @@ -6012,10 +6012,10 @@ is configured via an environment variable.") (arguments `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-humantime" ,rust-humantime-1.3) + ("rust-humantime" ,rust-humantime-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) - ("rust-termcolor" ,rust-termcolor-1.0)))))) + ("rust-termcolor" ,rust-termcolor-1)))))) (define-public rust-env-logger-0.5 (package @@ -6034,10 +6034,10 @@ is configured via an environment variable.") (arguments `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-humantime" ,rust-humantime-1.3) + ("rust-humantime" ,rust-humantime-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) - ("rust-termcolor" ,rust-termcolor-1.0)))))) + ("rust-termcolor" ,rust-termcolor-1)))))) (define-public rust-env-logger-0.4 (package @@ -7452,7 +7452,7 @@ featuring zero allocations, composability, and iterator-like interfaces.") (arguments `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.11)))) + ("rust-num-cpus" ,rust-num-cpus-1)))) (home-page "https://github.com/rust-lang-nursery/futures-rs") (synopsis "Implementation of thread pools which hand out futures") (description @@ -7481,7 +7481,7 @@ the computation on the threads themselves.") (("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-task" ,rust-futures-task-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-num-cpus" ,rust-num-cpus-1.11)))) + ("rust-num-cpus" ,rust-num-cpus-1)))) (home-page "https://rust-lang-nursery.github.io/futures-rs") (synopsis "Executors for asynchronous tasks based on the futures-rs library") (description @@ -7509,7 +7509,7 @@ the computation on the threads themselves.") (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-pin-utils" ,rust-pin-utils-0.1)))) (home-page "https://github.com/rust-lang/futures-rs") (synopsis @@ -8353,7 +8353,7 @@ retrieving random data from system source.") (("rust-crossbeam" ,rust-crossbeam-0.7) ("rust-getopts" ,rust-getopts-0.2) ("rust-memmap" ,rust-memmap-0.7) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-object" ,rust-object-0.12) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -9173,7 +9173,7 @@ loading crate.") ("rust-grep-regex" ,rust-grep-regex-0.1) ("rust-grep-searcher" ,rust-grep-searcher-0.1)) #:cargo-development-inputs - (("rust-termcolor" ,rust-termcolor-1.0) + (("rust-termcolor" ,rust-termcolor-1) ("rust-walkdir" ,rust-walkdir-2.2)))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line oriented regex searching as a library") @@ -9204,7 +9204,7 @@ loading crate.") ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) ("rust-same-file" ,rust-same-file-1.0) - ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-termcolor" ,rust-termcolor-1) ("rust-winapi-util" ,rust-winapi-util-0.1)))) (home-page "https://github.com/BurntSushi/ripgrep") @@ -9291,7 +9291,7 @@ the regex engine it uses pluggable.") ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-termcolor" ,rust-termcolor-1.0)) + ("rust-termcolor" ,rust-termcolor-1)) #:cargo-development-inputs (("rust-grep-regex" ,rust-grep-regex-0.1)))) (home-page "https://github.com/BurntSushi/ripgrep") @@ -10037,7 +10037,7 @@ or response body.") SystemTime}}.") (license (list license:expat license:asl2.0)))) -(define-public rust-humantime-1.3 +(define-public rust-humantime-1 (package (inherit rust-humantime-2) (name "rust-humantime") @@ -10098,7 +10098,7 @@ SystemTime}}.") ("rust-want" ,rust-want-0.2)) #:cargo-development-inputs (("rust-futures-timer" ,rust-futures-timer-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) ("rust-serde" ,rust-serde-1.0) @@ -10947,7 +10947,7 @@ primitives to an @code{io::Write}.") (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-futures" ,rust-futures-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-tempdir" ,rust-tempdir-0.3) ("rust-tokio-core" ,rust-tokio-core-0.1) ("rust-tokio-process" ,rust-tokio-process-0.2)))) @@ -13918,7 +13918,7 @@ including bigint, complex, rational, range iterators, generic integers, and more ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-serde" ,rust-serde-0.8)))))) -(define-public rust-num-cpus-1.11 +(define-public rust-num-cpus-1 (package (name "rust-num-cpus") (version "1.11.1") @@ -16563,7 +16563,7 @@ used in Cargo build scripts.") ("rust-base64" ,rust-base64-0.10) ("rust-xml-rs" ,rust-xml-rs-0.8) ("rust-serde" ,rust-serde-1.0) - ("rust-humantime" ,rust-humantime-1.3) + ("rust-humantime" ,rust-humantime-1) ("rust-byteorder" ,rust-byteorder-1.3)))) (home-page "https://github.com/ebarnard/rust-plist/") (synopsis "Rusty plist parser") @@ -18494,7 +18494,7 @@ accessors.") ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-num-cpus" ,rust-num-cpus-1.11)) + ("rust-num-cpus" ,rust-num-cpus-1)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.7) @@ -19746,7 +19746,7 @@ rustc compiler.") ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) ("rust-libm" ,rust-libm-0.2) ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-ordered-float" ,rust-ordered-float-1.0) ("rust-rustc-hash" ,rust-rustc-hash-1.0) ("rust-stb-truetype" ,rust-stb-truetype-0.3)))) @@ -19881,7 +19881,7 @@ using a fork-like interface.") `(#:cargo-inputs (("rust-no-panic" ,rust-no-panic-0.1)) #:cargo-development-inputs - (("rust-num-cpus" ,rust-num-cpus-1.11) + (("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.7) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2)))) (home-page "https://github.com/dtolnay/ryu") @@ -21342,7 +21342,7 @@ words, like Python's shlex.") ("rust-libc" ,rust-libc-0.2) ("rust-mio" ,rust-mio-0.6) ("rust-mio-uds" ,rust-mio-uds-0.6) - ("rust-signal-hook-registry" ,rust-signal-hook-registry-1.2) + ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) ("rust-tokio-reactor" ,rust-tokio-reactor-0.1)) #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.1) @@ -21352,7 +21352,7 @@ words, like Python's shlex.") (description "Unix signal handling.") (license (list license:asl2.0 license:expat)))) -(define-public rust-signal-hook-registry-1.2 +(define-public rust-signal-hook-registry-1 (package (name "rust-signal-hook-registry") (version "1.2.0") @@ -22656,7 +22656,7 @@ cryptographic implementations.") ("rust-regex" ,rust-regex-1) ;("rust-reqwest" ,rust-reqwest-0.10) ("rust-tar" ,rust-tar-0.4) - ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-termcolor" ,rust-termcolor-1) ("rust-walkdir" ,rust-walkdir-2.3)))) (home-page "https://github.com/dtolnay/syn") (synopsis "Parser for Rust source code") @@ -22688,7 +22688,7 @@ cryptographic implementations.") ("rust-rayon" ,rust-rayon-1) ("rust-ref-cast" ,rust-ref-cast-0.2) ("rust-regex" ,rust-regex-1) - ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-termcolor" ,rust-termcolor-1) ("rust-walkdir" ,rust-walkdir-2.2)))) (properties '()))) @@ -23437,7 +23437,7 @@ grid layout.") ("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.2)))))) -(define-public rust-termcolor-1.0 +(define-public rust-termcolor-1 (package (name "rust-termcolor") (version "1.0.5") @@ -23785,7 +23785,7 @@ different for every thread.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-num-cpus" ,rust-num-cpus-1.11)))) + (("rust-num-cpus" ,rust-num-cpus-1)))) (home-page "https://github.com/rust-threadpool/rust-threadpool") (synopsis "Thread pool for running jobs on a fixed set of worker threads") (description @@ -23929,10 +23929,10 @@ in Rust.") ("rust-mio" ,rust-mio-0.6) ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) ("rust-mio-uds" ,rust-mio-uds-0.6) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-parking-lot" ,rust-parking-lot-0.10) ("rust-pin-project-lite" ,rust-pin-project-lite-0.1) - ("rust-signal-hook-registry" ,rust-signal-hook-registry-1.2) + ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-macros" ,rust-tokio-macros-0.2) ("rust-winapi" ,rust-winapi-0.3)) @@ -23969,7 +23969,7 @@ backed applications.") ("rust-futures" ,rust-futures-0.1) ("rust-mio" ,rust-mio-0.6) ("rust-miow" ,rust-miow-0.3) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-tokio-codec" ,rust-tokio-codec-0.1) ("rust-tokio-current-thread" ,rust-tokio-current-thread-0.1) ("rust-tokio-executor" ,rust-tokio-executor-0.1) @@ -23990,7 +23990,7 @@ backed applications.") ("rust-http" ,rust-http-0.1) ("rust-httparse" ,rust-httparse-1.3) ("rust-libc" ,rust-libc-0.2) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) @@ -24088,7 +24088,7 @@ backed applications.") ("rust-http" ,rust-http-0.1) ("rust-httparse" ,rust-httparse-1.3) ("rust-libc" ,rust-libc-0.2) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) @@ -24234,7 +24234,7 @@ the current thread.") (arguments `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-tokio" ,rust-tokio-0.1) ("rust-tokio-executor" ,rust-tokio-executor-0.1)) #:cargo-development-inputs @@ -24403,14 +24403,14 @@ futures.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-parking-lot" ,rust-parking-lot-0.7) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-executor" ,rust-tokio-executor-0.1) ("rust-tokio-io" ,rust-tokio-io-0.1) ("rust-tokio-sync" ,rust-tokio-sync-0.1)) #:cargo-development-inputs - (("rust-num-cpus" ,rust-num-cpus-1.11) + (("rust-num-cpus" ,rust-num-cpus-1) ("rust-tokio" ,rust-tokio-0.1) ("rust-tokio-io-pool" ,rust-tokio-io-pool-0.1)))) (home-page "https://tokio.rs") @@ -24595,7 +24595,7 @@ futures.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-futures" ,rust-futures-0.1) ("rust-log" ,rust-log-0.4) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-rand" ,rust-rand-0.6) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-executor" ,rust-tokio-executor-0.1)) @@ -24893,7 +24893,7 @@ serializing Rust str") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-termcolor" ,rust-termcolor-1.0) + ("rust-termcolor" ,rust-termcolor-1) ("rust-toml" ,rust-toml-0.5)))) (home-page "https://github.com/dtolnay/trybuild") (synopsis "Test harness for ui tests of compiler diagnostics") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 05b7de1724..3d3e2cb122 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -60,7 +60,7 @@ ("rust-locale" ,rust-locale-0.2) ("rust-log" ,rust-log-0.4) ("rust-natord" ,rust-natord-1.0) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-number-prefix" ,rust-number-prefix-0.3) ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) ("rust-term-grid" ,rust-term-grid-0.1) @@ -160,7 +160,7 @@ also knows about symlinks, extended attributes, and Git.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-lscolors" ,rust-lscolors-0.7) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-regex" ,rust-regex-1) ("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-users" ,rust-users-0.10) @@ -227,10 +227,10 @@ provides defaults for 80% of the use cases.") ("rust-jemallocator" ,rust-jemallocator-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-regex" ,rust-regex-1) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-termcolor" ,rust-termcolor-1.0)) + ("rust-termcolor" ,rust-termcolor-1)) #:cargo-development-inputs (("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)) -- cgit v1.2.3