Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cargo2junit: fix build #344219

Merged
merged 2 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 154 additions & 0 deletions pkgs/by-name/ca/cargo2junit/0001-update-time-rs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
From 84e19417eb0c7768922cd5e05bc246b278c64ce2 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 24 Sep 2024 21:12:03 +0800
Subject: [PATCH] update time-rs

---
Cargo.lock | 61 ++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c56ff81..b20dca4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,6 +28,15 @@ dependencies = [
"strip-ansi-escapes",
]

+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
[[package]]
name = "derive-getters"
version = "0.2.0"
@@ -64,20 +73,32 @@ version = "2.5.0"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "proc-macro2"
-version = "1.0.55"
+version = "1.0.86"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]

[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.37"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -107,22 +128,22 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"

[[package]]
name = "serde"
-version = "1.0.159"
+version = "1.0.210"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]

[[package]]
name = "serde_derive"
-version = "1.0.159"
+version = "1.0.210"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.77",
]

[[package]]
@@ -158,9 +179,9 @@ dependencies = [

[[package]]
name = "syn"
-version = "2.0.13"
+version = "2.0.77"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@@ -184,16 +205,19 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.77",
]

[[package]]
name = "time"
-version = "0.3.20"
+version = "0.3.36"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
+ "deranged",
"itoa",
+ "num-conv",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -201,16 +225,17 @@ dependencies = [

[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

[[package]]
name = "time-macros"
-version = "0.2.8"
+version = "0.2.18"
source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]

--
2.46.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{ fetchCrate, lib, rustPlatform }:
{
fetchCrate,
lib,
rustPlatform,
}:

rustPlatform.buildRustPackage rec {
pname = "cargo2junit";
Expand All @@ -9,7 +13,11 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto=";
};

cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM=";
cargoPatches = [
./0001-update-time-rs.patch
];

cargoHash = "sha256-ncRELlbT8Dy8huLgZrroRWohCLeN5cRjMWrIW4JNcCM=";

meta = with lib; {
description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)";
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15694,8 +15694,6 @@ with pkgs;
);
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };

cargo2junit = callPackage ../development/tools/rust/cargo2junit { };

cargo-web = callPackage ../development/tools/rust/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
Expand Down