diff --git a/pkgs/by-name/gr/grcov/0001-update-time-rs.patch b/pkgs/by-name/gr/grcov/0001-update-time-rs.patch new file mode 100644 index 0000000000000..e3eb06eea9392 --- /dev/null +++ b/pkgs/by-name/gr/grcov/0001-update-time-rs.patch @@ -0,0 +1,193 @@ +From cd983416673fabf7bc55c0888c0f73f209f35e4e Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Fri, 27 Sep 2024 16:03:44 +0800 +Subject: [PATCH] update time-rs + +--- + Cargo.lock | 63 ++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 44 insertions(+), 19 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index af7c7f2..30cb4c3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -353,7 +353,7 @@ dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -463,6 +463,15 @@ dependencies = [ + "uuid", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "deunicode" + version = "0.4.3" +@@ -871,6 +880,12 @@ dependencies = [ + "bitflags 1.3.2", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.15" +@@ -970,7 +985,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1029,6 +1044,12 @@ version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1275,22 +1296,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.171" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.171" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1323,7 +1344,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" + dependencies = [ + "log", + "termcolor", +- "time 0.3.23", ++ "time 0.3.36", + ] + + [[package]] +@@ -1403,9 +1424,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.25" ++version = "2.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" ++checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" + dependencies = [ + "proc-macro2", + "quote", +@@ -1536,7 +1557,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1561,13 +1582,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.23" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1575,16 +1599,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.10" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -1762,7 +1787,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + "wasm-bindgen-shared", + ] + +@@ -1784,7 +1809,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.25", ++ "syn 2.0.32", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix new file mode 100644 index 0000000000000..1c2276bf46c5c --- /dev/null +++ b/pkgs/by-name/gr/grcov/package.nix @@ -0,0 +1,48 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.19"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "grcov"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; + }; + + cargoPatches = [ + ./0001-update-time-rs.patch + ]; + + cargoHash = "sha256-zbraeXyuXgif46tRFQpEZVZ6bInrgKbrqRArmjFIgU8="; + + # tests do not find grcov path correctly + checkFlags = + let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in + builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = { + description = "Rust tool to collect and aggregate code coverage data for multiple source files"; + mainProgram = "grcov"; + homepage = "https://github.com/mozilla/grcov"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ DieracDelta ]; + }; +} diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix deleted file mode 100644 index d097f389deb94..0000000000000 --- a/pkgs/development/tools/misc/grcov/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "grcov"; - version = "0.8.19"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; - }; - - cargoHash = "sha256-4KzFbfUqnGmle2fwSaHMPIJHQFDq8H2Qzm4FdYdqpuM="; - - # tests do not find grcov path correctly - checkFlags = let - skipList = [ - "test_coveralls_service_job_id_is_not_sufficient" - "test_coveralls_service_name_is_not_sufficient" - "test_coveralls_works_with_just_service_name_and_job_id_args" - "test_coveralls_works_with_just_token_arg" - "test_integration" - "test_integration_guess_single_file" - "test_integration_zip_dir" - "test_integration_zip_zip" - ]; - skipFlag = test: "--skip " + test; - in builtins.concatStringsSep " " (builtins.map skipFlag skipList); - - meta = with lib; { - description = - "Rust tool to collect and aggregate code coverage data for multiple source files"; - mainProgram = "grcov"; - homepage = "https://github.com/mozilla/grcov"; - license = licenses.mpl20; - maintainers = with maintainers; [ DieracDelta ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 146daf3109aa2..f32fee5131414 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17890,8 +17890,6 @@ with pkgs; gradle_8 = wrapGradle gradle_8-unwrapped; gradle = wrapGradle gradle-unwrapped; - grcov = callPackage ../development/tools/misc/grcov { }; - gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };