* [PR PATCH] cargo: added patch for #28372
@ 2021-02-01 1:52 RossComputerGuy
2021-02-01 1:58 ` ericonr
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 1:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is a new pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 1248 bytes --]
From 421b89460fd1f0548744ef5a7ce3c51f0adf2585 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..b177d71a18a
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,13 @@
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
@ 2021-02-01 1:58 ` ericonr
2021-02-01 2:00 ` [PR PATCH] [Updated] " RossComputerGuy
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 1:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770512839
Comment:
Please add where the patch came from at the top of the file.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
2021-02-01 1:58 ` ericonr
@ 2021-02-01 2:00 ` RossComputerGuy
2021-02-01 2:01 ` RossComputerGuy
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 2030 bytes --]
From 421b89460fd1f0548744ef5a7ce3c51f0adf2585 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 1/2] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..b177d71a18a
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,13 @@
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From 8ce12b15a338ca038cd94312133918e92fe3b261 Mon Sep 17 00:00:00 2001
From: Tristan Ross <spaceboyross@yandex.com>
Date: Sun, 31 Jan 2021 18:00:38 -0800
Subject: [PATCH 2/2] cargo: added patch location
---
srcpkgs/cargo/patches/fix-serde.diff | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index b177d71a18a..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,3 +1,4 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
2021-02-01 1:58 ` ericonr
2021-02-01 2:00 ` [PR PATCH] [Updated] " RossComputerGuy
@ 2021-02-01 2:01 ` RossComputerGuy
2021-02-01 2:19 ` ericonr
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770513596
Comment:
I have done that now
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (2 preceding siblings ...)
2021-02-01 2:01 ` RossComputerGuy
@ 2021-02-01 2:19 ` ericonr
2021-02-01 2:28 ` [PR PATCH] [Updated] " RossComputerGuy
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 2:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770519017
Comment:
This should still be a single commit. Please squash them.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (3 preceding siblings ...)
2021-02-01 2:19 ` ericonr
@ 2021-02-01 2:28 ` RossComputerGuy
2021-02-01 2:28 ` RossComputerGuy
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 2:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 3409 bytes --]
From 421b89460fd1f0548744ef5a7ce3c51f0adf2585 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 1/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..b177d71a18a
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,13 @@
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From 8ce12b15a338ca038cd94312133918e92fe3b261 Mon Sep 17 00:00:00 2001
From: Tristan Ross <spaceboyross@yandex.com>
Date: Sun, 31 Jan 2021 18:00:38 -0800
Subject: [PATCH 2/3] cargo: added patch location
---
srcpkgs/cargo/patches/fix-serde.diff | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index b177d71a18a..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,3 +1,4 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
From b63f0ed70cd686816834c7c4816ca585592ce252 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 3/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (4 preceding siblings ...)
2021-02-01 2:28 ` [PR PATCH] [Updated] " RossComputerGuy
@ 2021-02-01 2:28 ` RossComputerGuy
2021-02-01 3:00 ` ericonr
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 2:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770521412
Comment:
Ok, I tried to do that
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (5 preceding siblings ...)
2021-02-01 2:28 ` RossComputerGuy
@ 2021-02-01 3:00 ` ericonr
2021-02-01 3:02 ` RossComputerGuy
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 3:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770530932
Comment:
That's not what you did... https://github.com/void-linux/void-packages/pull/28373/commits
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (6 preceding siblings ...)
2021-02-01 3:00 ` ericonr
@ 2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:02 ` RossComputerGuy
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770531398
Comment:
https://www.git-tower.com/learn/git/faq/git-squash/ I followed what this website did, `git rebase -i HEAD~2` then I edited the last one to say "squash" instead of "push". But when I did that, it said that `git pull` and a merge is needed.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (7 preceding siblings ...)
2021-02-01 3:02 ` RossComputerGuy
@ 2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:26 ` [PR PATCH] [Updated] " RossComputerGuy
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770531398
Comment:
https://www.git-tower.com/learn/git/faq/git-squash/ I followed what this website did, `git rebase -i HEAD~2` then I edited the last one to say "squash" instead of "pick". But when I did that, it said that `git pull` and a merge is needed.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (8 preceding siblings ...)
2021-02-01 3:02 ` RossComputerGuy
@ 2021-02-01 3:26 ` RossComputerGuy
2021-02-01 3:26 ` RossComputerGuy
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 5108 bytes --]
From 421b89460fd1f0548744ef5a7ce3c51f0adf2585 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 1/5] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..b177d71a18a
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,13 @@
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From 8ce12b15a338ca038cd94312133918e92fe3b261 Mon Sep 17 00:00:00 2001
From: Tristan Ross <spaceboyross@yandex.com>
Date: Sun, 31 Jan 2021 18:00:38 -0800
Subject: [PATCH 2/5] cargo: added patch location
---
srcpkgs/cargo/patches/fix-serde.diff | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index b177d71a18a..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,3 +1,4 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
From b63f0ed70cd686816834c7c4816ca585592ce252 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 3/5] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From c7b528bedeefed4be2a8c4639c3bd707e98696ea Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:24:51 -0800
Subject: [PATCH 4/5] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index d76499f5cd9..e7c1bc28726 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,4 +1,6 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+=======
+>>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
From c690262778c8ae0d857e12f2c74abb9089eb4d36 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:25:51 -0800
Subject: [PATCH 5/5] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index e7c1bc28726..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,6 +1,4 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
-=======
->>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (9 preceding siblings ...)
2021-02-01 3:26 ` [PR PATCH] [Updated] " RossComputerGuy
@ 2021-02-01 3:26 ` RossComputerGuy
2021-02-01 3:40 ` ericonr
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770538774
Comment:
I tried to squash it again
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (10 preceding siblings ...)
2021-02-01 3:26 ` RossComputerGuy
@ 2021-02-01 3:40 ` ericonr
2021-02-01 3:41 ` RossComputerGuy
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 3:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770542231
Comment:
You're trying to merge it with itself, this just shouldn't happen... Are you pushing with `git push -f` ?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (11 preceding siblings ...)
2021-02-01 3:40 ` ericonr
@ 2021-02-01 3:41 ` RossComputerGuy
2021-02-01 3:43 ` ericonr
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770542460
Comment:
I'm just pushing like normal
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (12 preceding siblings ...)
2021-02-01 3:41 ` RossComputerGuy
@ 2021-02-01 3:43 ` ericonr
2021-02-01 3:45 ` [PR PATCH] [Updated] " RossComputerGuy
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 3:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770543050
Comment:
Yeah don't do that. You need to force push so it overwrites the changes here (which we want).
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (13 preceding siblings ...)
2021-02-01 3:43 ` ericonr
@ 2021-02-01 3:45 ` RossComputerGuy
2021-02-01 3:46 ` RossComputerGuy
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 3077 bytes --]
From b63f0ed70cd686816834c7c4816ca585592ce252 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 1/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From c7b528bedeefed4be2a8c4639c3bd707e98696ea Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:24:51 -0800
Subject: [PATCH 2/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index d76499f5cd9..e7c1bc28726 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,4 +1,6 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+=======
+>>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
From f1df337d0e9300bacf8a8d8ef21a6ccc456eb359 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 19:25:51 -0800
Subject: [PATCH 3/3] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
index e7c1bc28726..d76499f5cd9 100644
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -1,6 +1,4 @@
This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
-=======
->>>>>>> 421b89460f (cargo: added patch for #28372)
diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (14 preceding siblings ...)
2021-02-01 3:45 ` [PR PATCH] [Updated] " RossComputerGuy
@ 2021-02-01 3:46 ` RossComputerGuy
2021-02-01 3:46 ` RossComputerGuy
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by RossComputerGuy against master on the void-packages repository
https://github.com/RossComputerGuy/void-packages fix/cargo
https://github.com/void-linux/void-packages/pull/28373
cargo: added patch for #28372
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/cargo-28373.patch --]
[-- Type: text/x-diff, Size: 1374 bytes --]
From 5c5c1fa88926a9ae9dd85fc2877a3bd58713c9ab Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (15 preceding siblings ...)
2021-02-01 3:46 ` RossComputerGuy
@ 2021-02-01 3:46 ` RossComputerGuy
2021-02-01 3:58 ` ericonr
2021-02-01 4:11 ` [PR PATCH] [Merged]: " ericonr
18 siblings, 0 replies; 20+ messages in thread
From: RossComputerGuy @ 2021-02-01 3:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by RossComputerGuy on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770544068
Comment:
I think I got it now
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (16 preceding siblings ...)
2021-02-01 3:46 ` RossComputerGuy
@ 2021-02-01 3:58 ` ericonr
2021-02-01 4:11 ` [PR PATCH] [Merged]: " ericonr
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 3:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28373#issuecomment-770547061
Comment:
Since this didn't trigger a CI run (feel free to improve the hook to detect changes in files other than templates), I will test manually in a bit.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: cargo: added patch for #28372
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
` (17 preceding siblings ...)
2021-02-01 3:58 ` ericonr
@ 2021-02-01 4:11 ` ericonr
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-02-01 4:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
There's a merged pull request on the void-packages repository
cargo: added patch for #28372
https://github.com/void-linux/void-packages/pull/28373
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-02-01 4:11 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 1:52 [PR PATCH] cargo: added patch for #28372 RossComputerGuy
2021-02-01 1:58 ` ericonr
2021-02-01 2:00 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 2:01 ` RossComputerGuy
2021-02-01 2:19 ` ericonr
2021-02-01 2:28 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 2:28 ` RossComputerGuy
2021-02-01 3:00 ` ericonr
2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:02 ` RossComputerGuy
2021-02-01 3:26 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 3:26 ` RossComputerGuy
2021-02-01 3:40 ` ericonr
2021-02-01 3:41 ` RossComputerGuy
2021-02-01 3:43 ` ericonr
2021-02-01 3:45 ` [PR PATCH] [Updated] " RossComputerGuy
2021-02-01 3:46 ` RossComputerGuy
2021-02-01 3:46 ` RossComputerGuy
2021-02-01 3:58 ` ericonr
2021-02-01 4:11 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).