Merge pull request #299341 from marsam/update-tokio-console

tokio-console: 0.1.9 -> 0.1.10
This commit is contained in:
Mario Rodas 2024-04-01 09:28:22 -05:00 committed by GitHub
commit b80740b0df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 19 deletions

View File

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index fcbe50c..27d4c30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1390,7 +1390,7 @@ dependencies = [
[[package]]
name = "tokio-console"
-version = "0.1.8"
+version = "0.1.9"
dependencies = [
"atty",
"clap",

View File

@ -1,25 +1,27 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, installShellFiles
, rustPlatform , rustPlatform
, protobuf , protobuf
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tokio-console"; pname = "tokio-console";
version = "0.1.9"; version = "0.1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tokio-rs"; owner = "tokio-rs";
repo = "console"; repo = "console";
rev = "tokio-console-v${version}"; rev = "tokio-console-v${version}";
hash = "sha256-zISgEhUmAfHErq4AelbnSwtKjtxYH//pbLUAlPKxQYk="; hash = "sha256-sjfdxOeaNANYJuJMjZ/tCGc2mWM+98d8yPHAVSl4cF4=";
}; };
cargoHash = "sha256-qK8U6BZN7sdBP8CbzsDeewsGulNA/KFVS9vscBxysRg="; cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI=";
nativeBuildInputs = [ protobuf ]; nativeBuildInputs = [
installShellFiles
cargoPatches = [ ./cargo-lock.patch ]; protobuf
];
# uses currently unstable tokio features # uses currently unstable tokio features
RUSTFLAGS = "--cfg tokio_unstable"; RUSTFLAGS = "--cfg tokio_unstable";
@ -31,6 +33,13 @@ rustPlatform.buildRustPackage rec {
"--skip config::tests::toml_example_changed" "--skip config::tests::toml_example_changed"
]; ];
postInstall = ''
installShellCompletion --cmd tokio-console \
--bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \
--fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \
--zsh <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion zsh)
'';
meta = with lib; { meta = with lib; {
description = "A debugger for asynchronous Rust code"; description = "A debugger for asynchronous Rust code";
homepage = "https://github.com/tokio-rs/console"; homepage = "https://github.com/tokio-rs/console";