about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--users/aspen/pkgs/cargo-hakari.nix27
-rw-r--r--users/aspen/pkgs/cargo-nextest.nix27
-rw-r--r--users/aspen/system/home/modules/development/rust.nix8
3 files changed, 4 insertions, 58 deletions
diff --git a/users/aspen/pkgs/cargo-hakari.nix b/users/aspen/pkgs/cargo-hakari.nix
deleted file mode 100644
index b6f4e7e40007..000000000000
--- a/users/aspen/pkgs/cargo-hakari.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ 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/aspen/pkgs/cargo-nextest.nix b/users/aspen/pkgs/cargo-nextest.nix
deleted file mode 100644
index dbf3bd7eef19..000000000000
--- a/users/aspen/pkgs/cargo-nextest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-nextest";
-  version = "0.9.36";
-
-  src = fetchFromGitHub {
-    owner = "nextest-rs";
-    repo = "nextest";
-    rev = "cargo-nextest-${version}";
-    sha256 = "1g40r38bqmdhc0dy07pj27vkc64d3fw6v5z2vwn82xld2h9dg7w2";
-  };
-
-  cargoSha256 = "1g862azgkn3xk3v3chs8hv1b1prj1pq2vfzbhcx6ir9l00kv6gcv";
-
-  cargoTestFlags = [
-    "--"
-    "--skip"
-    "tests_integration::test_relocated_run"
-    "--skip"
-    "tests_integration::test_run"
-    "--skip"
-    "tests_integration::test_run_after_build"
-  ];
-}
diff --git a/users/aspen/system/home/modules/development/rust.nix b/users/aspen/system/home/modules/development/rust.nix
index c4b20f231546..3c81e2398010 100644
--- a/users/aspen/system/home/modules/development/rust.nix
+++ b/users/aspen/system/home/modules/development/rust.nix
@@ -10,16 +10,16 @@ with lib;
 
   home.packages = with pkgs; [
     rustup
+
+    cargo-bloat
     cargo-edit
     cargo-expand
+    cargo-hakari
+    cargo-nextest
     cargo-udeps
-    cargo-bloat
     sccache
     evcxr
 
-    depot.users.aspen.pkgs.cargo-hakari
-    depot.users.aspen.pkgs.cargo-nextest
-
     # benchmarking+profiling
     cargo-criterion
     cargo-flamegraph