diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2024-03-11 12:14:42 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2024-07-19 00:40:22 +0300 |
commit | e4a259410a6e4710e9e36c3ffa9c19d2e5781367 (patch) | |
tree | c9edc5eb51300ae5f470d7efcb95bab9f896ede7 | |
parent | c76176a6c679b631d184a5ed6764e8a80dc0ea2a (diff) | |
download | guix-e4a259410a6e4710e9e36c3ffa9c19d2e5781367.tar.gz |
gnu: Remove rust-cargo-0.76.
* gnu/packages/crates-io.scm (rust-cargo-0.76): Remove variable. * gnu/packages/rust-apps.scm (rust-cargo-c)[cargo-inputs]: Replace rust-cargo-0.76 with rust-cargo. Change-Id: I5ec1f0b1bc325a82f6c72e5a0e28fb389e762d4f
-rw-r--r-- | gnu/packages/crates-io.scm | 98 | ||||
-rw-r--r-- | gnu/packages/rust-apps.scm | 2 |
2 files changed, 1 insertions, 99 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fbe0e2a6a..c1db141e7f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9725,104 +9725,6 @@ capabilities.") (description "This package provides spec generation for clap-rs/clap.") (license license:expat))) -;; TODO: Remove this package in favor of rust-cargo in rust-apps.scm. -(define-public rust-cargo-0.76 - (package - (name "rust-cargo") - (version "0.76.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "cargo" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "14yjyvj9bl6mlzx6bbi3igflgdrx1hil9ifnf1dl9xnm4mb2gjw6")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f ; unresolved import `cargo_test_support` - #:cargo-inputs - (("rust-anstream" ,rust-anstream-0.6) - ("rust-anstyle" ,rust-anstyle-1) - ("rust-anyhow" ,rust-anyhow-1) - ("rust-base64" ,rust-base64-0.21) - ("rust-bytesize" ,rust-bytesize-1) - ("rust-cargo-credential" ,rust-cargo-credential-0.4) - ("rust-cargo-credential-libsecret" ,rust-cargo-credential-libsecret-0.4) - ("rust-cargo-credential-macos-keychain" ,rust-cargo-credential-macos-keychain-0.4) - ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4) - ("rust-cargo-platform" ,rust-cargo-platform-0.1) - ("rust-cargo-util" ,rust-cargo-util-0.2) - ("rust-clap" ,rust-clap-4) - ("rust-color-print" ,rust-color-print-0.3) - ("rust-crates-io" ,rust-crates-io-0.39) - ("rust-curl" ,rust-curl-0.4) - ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-filetime" ,rust-filetime-0.2) - ("rust-flate2" ,rust-flate2-1) - ("rust-flate2" ,rust-flate2-1) - ("rust-git2" ,rust-git2-0.18) - ("rust-git2-curl" ,rust-git2-curl-0.19) - ("rust-gix" ,rust-gix-0.55) - ("rust-gix-features" ,rust-gix-features-0.35) - ("rust-glob" ,rust-glob-0.3) - ("rust-hex" ,rust-hex-0.4) - ("rust-hmac" ,rust-hmac-0.12) - ("rust-home" ,rust-home-0.5) - ("rust-http-auth" ,rust-http-auth-0.1) - ("rust-humantime" ,rust-humantime-2) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-im-rc" ,rust-im-rc-15) - ("rust-indexmap" ,rust-indexmap-2) - ("rust-itertools" ,rust-itertools-0.11) - ("rust-jobserver" ,rust-jobserver-0.1) - ("rust-lazycell" ,rust-lazycell-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-libgit2-sys" ,rust-libgit2-sys-0.16) - ("rust-memchr" ,rust-memchr-2) - ("rust-opener" ,rust-opener-0.6) - ("rust-openssl" ,rust-openssl-0.10) - ("rust-os-info" ,rust-os-info-3) - ("rust-pasetors" ,rust-pasetors-0.6) - ("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) - ("rust-rand" ,rust-rand-0.8) - ("rust-rustfix" ,rust-rustfix-0.6) - ("rust-semver" ,rust-semver-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-untagged" ,rust-serde-untagged-0.1) - ("rust-serde-value" ,rust-serde-value-0.7) - ("rust-serde-ignored" ,rust-serde-ignored-0.1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-sha1" ,rust-sha1-0.10) - ("rust-shell-escape" ,rust-shell-escape-0.1) - ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) - ("rust-syn" ,rust-syn-2) - ("rust-tar" ,rust-tar-0.4) - ("rust-tar" ,rust-tar-0.4) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-time" ,rust-time-0.3) - ("rust-toml" ,rust-toml-0.8) - ("rust-toml-edit" ,rust-toml-edit-0.20) - ("rust-tracing" ,rust-tracing-0.1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) - ("rust-unicase" ,rust-unicase-2) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-unicode-xid" ,rust-unicode-xid-0.2) - ("rust-url" ,rust-url-2) - ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.48)) - #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1) - ("rust-snapbox" ,rust-snapbox-0.4)))) - (native-inputs - (list pkg-config)) - (inputs - (list curl libssh2 libgit2-1.7 openssl zlib)) - (home-page "https://crates.io") - (synopsis "Package manager for Rust") - (description "Cargo, a package manager for Rust. This package provides -the library crate of Cargo.") - (license (list license:expat license:asl2.0)))) - (define-public rust-cargo-config2-0.1 (package (name "rust-cargo-config2") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d73bd1a030..800d6f5dd5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2514,7 +2514,7 @@ the library crate of Cargo.") (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-cargo" ,rust-cargo-0.76) + ("rust-cargo" ,rust-cargo) ("rust-cargo-util" ,rust-cargo-util-0.2) ("rust-cbindgen" ,rust-cbindgen-0.26) ("rust-cc" ,rust-cc-1) |