From 99f7dad9393595566a12130545cbb93c288d374b Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sat, 24 Feb 2024 15:32:01 -0500
Subject: [PATCH] bump nix (rust crate) and add either

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.lock | 15 +++++++++++++--
 Cargo.toml |  4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf08cf40..59093f03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -325,6 +325,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "clang-sys"
 version = "1.7.0"
@@ -391,6 +397,7 @@ dependencies = [
  "base64",
  "bytes",
  "clap",
+ "either",
  "figment",
  "futures-util",
  "hmac",
@@ -605,6 +612,9 @@ name = "either"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "encoding_rs"
@@ -1422,12 +1432,13 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
+ "cfg_aliases",
  "libc",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index b2168d1e..ce37ee71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,9 +106,11 @@ webpage = { version = "2.0", default-features = false }
 
 rocksdb = { version = "0.22.0", default-features = true, features = ["multi-threaded-cf", "zstd"], optional = true }
 
+either = { version = "1.10.0", features = ["serde"] }
+
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.27.1", features = ["resource"] }
+nix = { version = "0.28.0", features = ["resource"] }
 
 [features]
 default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"]