Unverified Commit b80740b0 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

tokio-console: 0.1.9 -> 0.1.10
parents b77789fa 8f19a544

pkgs/development/tools/tokio-console/cargo-lock.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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",

pkgs/development/tools/tokio-console/default.nix

+15 −6
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, installShellFiles

, rustPlatform

, protobuf

}:



rustPlatform.buildRustPackage rec {

  pname = "tokio-console";

  version = "0.1.9";

  version = "0.1.10";



  src = fetchFromGitHub {

    owner = "tokio-rs";

    repo = "console";

    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 ];



  cargoPatches = [ ./cargo-lock.patch ];

  nativeBuildInputs = [

    installShellFiles

    protobuf

  ];



  # uses currently unstable tokio features

  RUSTFLAGS = "--cfg tokio_unstable";
@@ -31,6 +33,13 @@ rustPlatform.buildRustPackage rec { 
    "--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; {

    description = "A debugger for asynchronous Rust code";

    homepage = "https://github.com/tokio-rs/console";