From bdf614ec3df400c7682f4ca4ec9a488ab7b3691f Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Tue, 14 Jun 2022 10:15:11 -0400 Subject: feat(grfn/home): Install some new rust utilities Change-Id: I9e210a86a037c58aa832b25203b5ac8c27306aa3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5933 Tested-by: BuildkiteCI Reviewed-by: grfn Autosubmit: grfn --- users/grfn/pkgs/cargo-hakari.nix | 27 ++++++++++++++++++++++ users/grfn/pkgs/cargo-nextest.nix | 27 ++++++++++++++++++++++ .../grfn/system/home/modules/development/rust.nix | 14 +++++++++-- 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 users/grfn/pkgs/cargo-hakari.nix create mode 100644 users/grfn/pkgs/cargo-nextest.nix diff --git a/users/grfn/pkgs/cargo-hakari.nix b/users/grfn/pkgs/cargo-hakari.nix new file mode 100644 index 0000000000..b6f4e7e400 --- /dev/null +++ b/users/grfn/pkgs/cargo-hakari.nix @@ -0,0 +1,27 @@ +{ pkgs, ... }: + +with pkgs; + +rustPlatform.buildRustPackage rec { + pname = "cargo-hakari"; + version = "0.9.13"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "cargo-guppy"; + rev = "cargo-hakari-${version}"; + sha256 = "11ds2zryxdd6rvszkpphb0xnfg7rqisg6kixrwyiydjrm5rdjg9d"; + }; + + cargoSha256 = "0b2hjyak5v4m3g5zjk2q8bdb4iv3015qw1rmhpclv4cv48lcmdbb"; + + buildAndTestSubdir = "tools/cargo-hakari"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; +} diff --git a/users/grfn/pkgs/cargo-nextest.nix b/users/grfn/pkgs/cargo-nextest.nix new file mode 100644 index 0000000000..5339a6e600 --- /dev/null +++ b/users/grfn/pkgs/cargo-nextest.nix @@ -0,0 +1,27 @@ +{ pkgs, ... }: + +with pkgs; + +rustPlatform.buildRustPackage rec { + pname = "cargo-nextest"; + version = "0.9.14"; + + src = fetchFromGitHub { + owner = "nextest-rs"; + repo = "nextest"; + rev = "cargo-nextest-${version}"; + sha256 = "0nc8xz90m03yydj7zafjgciv4vxwzbz814pnjdi49ddkr4q20sc3"; + }; + + cargoSha256 = "0rcsh573qryllgc199ah2dbrn1xcp215q2xkjb3f4ps757m7scnm"; + + cargoTestFlags = [ + "--" + "--skip" + "tests_integration::test_relocated_run" + "--skip" + "tests_integration::test_run" + "--skip" + "tests_integration::test_run_after_build" + ]; +} diff --git a/users/grfn/system/home/modules/development/rust.nix b/users/grfn/system/home/modules/development/rust.nix index 4ae5bc3bcc..95a9ad1a91 100644 --- a/users/grfn/system/home/modules/development/rust.nix +++ b/users/grfn/system/home/modules/development/rust.nix @@ -1,18 +1,28 @@ { config, lib, pkgs, ... }: - +let + inherit (config.lib) depot; +in { + home.packages = with pkgs; [ rustup rust-analyzer cargo-edit cargo-expand - cargo-flamegraph cargo-rr cargo-udeps cargo-bloat sccache evcxr + + depot.users.grfn.pkgs.cargo-hakari + depot.users.grfn.pkgs.cargo-nextest + + # benchmarking+profiling + cargo-criterion + cargo-flamegraph + coz ]; programs.zsh.shellAliases = { -- cgit 1.4.1