From 0612ea653049dfc3ead006bbc0d2287bf3f48a8b Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Tue, 1 Apr 2025 14:33:40 -0400
Subject: [PATCH] fix cargo and flake stuff
---
Cargo.lock | 49 -------------------------------------------------
Cargo.toml | 2 +-
flake.nix | 4 +++-
3 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index d16b9d3..30716eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -730,16 +730,6 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
[[package]]
name = "log"
version = "0.4.27"
@@ -867,29 +857,6 @@ dependencies = [
"vcpkg",
]
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "percent-encoding"
version = "2.3.1"
@@ -953,15 +920,6 @@ version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
-[[package]]
-name = "redox_syscall"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
-dependencies = [
- "bitflags",
-]
-
[[package]]
name = "regex"
version = "1.11.1"
@@ -1128,12 +1086,6 @@ dependencies = [
"windows-sys 0.59.0",
]
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
[[package]]
name = "security-framework"
version = "2.11.1"
@@ -1344,7 +1296,6 @@ dependencies = [
"bytes",
"libc",
"mio",
- "parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
diff --git a/Cargo.toml b/Cargo.toml
index 2428f7e..a037e6f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,4 @@ log = "0.4.27"
reqwest = "0.12.15"
serde = { version = "1.0.219", features = [ "derive" ]}
serde_json = "1.0.140"
-tokio = { version = "1.44.1", features = [ "full" ]}
+tokio = { version = "1.44.1", features = [ "rt", "rt-multi-thread", "macros", "sync", "process" ]}
diff --git a/flake.nix b/flake.nix
index 53b074e..c263f49 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,8 @@
(import inputs.rust-overlay)
];
};
- craneLib = (crane.mkLib pkgs).overrideToolchain(p: p.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml);
+ toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+ craneLib = (crane.mkLib pkgs).overrideToolchain(_: toolchain);
in
{
devShells.default = pkgs.mkShell {
@@ -29,6 +30,7 @@
];
buildInputs = with pkgs; [
openssl
+ toolchain
];
};