Page MenuHomeSolus
Files F10889552

D4586.id11320.diff
No OneTemporary
Actions

D4586.id11320.diff
View Options

diff --git a/files/0001-cargo-clipy-edition.patch b/files/0001-cargo-clipy-edition.patch
deleted file mode 100644
--- a/files/0001-cargo-clipy-edition.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index 518c2caf6..ef02e1b66 100644
---- a/src/tools/clippy/Cargo.toml
-+++ b/src/tools/clippy/Cargo.toml
-@@ -1,3 +1,5 @@
-+cargo-features = ["edition"]
-+
- [package]
- name = "clippy"
- version = "0.0.212"
-diff --git a/src/tools/clippy/clippy_dev/Cargo.toml b/src/tools/clippy/clippy_dev/Cargo.toml
-index 5380ecd98..4e3c7a250 100644
---- a/src/tools/clippy/clippy_dev/Cargo.toml
-+++ b/src/tools/clippy/clippy_dev/Cargo.toml
-@@ -1,3 +1,5 @@
-+cargo-features = ["edition"]
-+
- [package]
- name = "clippy_dev"
- version = "0.0.1"
-diff --git a/src/tools/clippy/clippy_lints/Cargo.toml b/src/tools/clippy/clippy_lints/Cargo.toml
-index 8907dd365..15da5d658 100644
---- a/src/tools/clippy/clippy_lints/Cargo.toml
-+++ b/src/tools/clippy/clippy_lints/Cargo.toml
-@@ -1,3 +1,5 @@
-+cargo-features = ["edition"]
-+
- [package]
- name = "clippy_lints"
- # begin automatic update
-diff --git a/src/tools/clippy/rustc_tools_util/Cargo.toml b/src/tools/clippy/rustc_tools_util/Cargo.toml
-index 020de6c33..01dca0a65 100644
---- a/src/tools/clippy/rustc_tools_util/Cargo.toml
-+++ b/src/tools/clippy/rustc_tools_util/Cargo.toml
-@@ -1,3 +1,5 @@
-+cargo-features = ["edition"]
-+
- [package]
- name = "rustc_tools_util"
- version = "0.1.0"
-diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml
-index f79609c76..669a5d56c 100644
---- a/src/tools/miri/Cargo.toml
-+++ b/src/tools/miri/Cargo.toml
-@@ -1,5 +1,3 @@
--cargo-features = ["default-run"]
--
- [package]
- authors = ["Scott Olson <scott@solson.me>"]
- description = "An experimental interpreter for Rust MIR."
-diff --git a/src/tools/rls/Cargo.toml b/src/tools/rls/Cargo.toml
-index 974b7fda0..73582d0c5 100644
---- a/src/tools/rls/Cargo.toml
-+++ b/src/tools/rls/Cargo.toml
-@@ -1,3 +1,5 @@
-+cargo-features = ["edition"]
-+
- [package]
- name = "rls"
- version = "1.31.6"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : cargo
version : 0.32.0
-release : 15
+release : 16
source :
- https://static.rust-lang.org/dist/rustc-1.31.0-src.tar.gz : 9ad54dc0baf1db5fc6a79d54e71c439c82aff85cd96778978456f2958211ef06
license :
@@ -13,8 +13,7 @@
component : programming
summary : The Rust package manager
description: |
- Cargo is a tool that allows Rust projects to declare their various
- dependencies and ensure that you'll always get a repeatable build.
+ Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you'll always get a repeatable build.
networking : yes
builddeps :
- pkgconfig(libssl)
@@ -24,7 +23,6 @@
rundeps :
- rust
build : |
- %patch -p1 < $pkgfiles/0001-cargo-clipy-edition.patch
cd src/tools/cargo
cargo build %JOBS% --release
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -13,16 +13,14 @@
<License>BSD-3-Clause</License>
<PartOf>programming</PartOf>
<Summary xml:lang="en">The Rust package manager</Summary>
- <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various
-dependencies and ensure that you&apos;ll always get a repeatable build.
+ <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you&apos;ll always get a repeatable build.
</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
</Source>
<Package>
<Name>cargo</Name>
<Summary xml:lang="en">The Rust package manager</Summary>
- <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various
-dependencies and ensure that you&apos;ll always get a repeatable build.
+ <Description xml:lang="en">Cargo is a tool that allows Rust projects to declare their various dependencies and ensure that you&apos;ll always get a repeatable build.
</Description>
<PartOf>programming</PartOf>
<Files>
@@ -112,7 +110,7 @@
</Files>
</Package>
<History>
- <Update release="15">
+ <Update release="16">
<Date>2018-12-07</Date>
<Version>0.32.0</Version>
<Comment>Packaging update</Comment>

File Metadata

Mime Type
text/plain
Expires
Jun 29 2023, 12:16 AM (5 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5860462
Default Alt Text
D4586.id11320.diff (4 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.