git.delta.rocks / jrsonnet / refs/commits / 2c5a4bd2d3da

difftreelog

Merge pull request #2 from CertainLach/fix-alejandra-hash

Yaroslav Bolyukin2024-05-14parents: #459a846 #b663896.patch.diff
in: trunk

5 files changed

modifiedCargo.lockdiffbeforeafterboth
after · Cargo.lock
310 packageslockfile v3
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,4 @@
 bifrostlink = "0.1.0"
 uuid = { version = "1.7.0", features = ["v4"] }
 tokio = { version = "1.36.0", features = ["fs", "rt", "macros", "sync", "time", "rt-multi-thread"] }
+
modifiedcmds/fleet/Cargo.tomldiffbeforeafterboth
--- a/cmds/fleet/Cargo.toml
+++ b/cmds/fleet/Cargo.toml
@@ -22,7 +22,7 @@
 base64 = "0.21"
 chrono = { version = "0.4", features = ["serde"] }
 z85 = "3.0"
-clap = { version = "4.5", features = ["derive", "env", "wrap_help", "unicode"] }
+clap = { version = ">=4.4, <4.5", features = ["derive", "env", "wrap_help", "unicode"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
 tokio-util = { version = "0.7", features = ["codec"] }
modifiedcmds/install-secrets/Cargo.tomldiffbeforeafterboth
--- a/cmds/install-secrets/Cargo.toml
+++ b/cmds/install-secrets/Cargo.toml
@@ -2,6 +2,8 @@
 name = "fleet-install-secrets"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.73"
+
 
 [dependencies]
 age = { version = "0.10.0", features = ["ssh"] }
@@ -11,7 +13,7 @@
 nix = {version = "0.27.1", features = ["user", "fs"]}
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
-clap = { version = "4.5.1", features = [
+clap = { version = ">=4.4, <4.5", features = [
 	"derive",
 	"env",
 	"wrap_help",
modifiednixos/fleetPkgs.nixdiffbeforeafterboth
--- a/nixos/fleetPkgs.nix
+++ b/nixos/fleetPkgs.nix
@@ -15,7 +15,7 @@
           cargoLock = {
             lockFile = ../Cargo.lock;
             outputHashes = {
-              "alejandra-3.0.0" = "sha256-lStDIPizbJipd1JpNKX1olBKzyIosyC2U/mVFwJPcZE=";
+              "alejandra-3.0.0" = "sha256-q2oTMen8E1YUbNyU4chPOj728/YR0RzdpN+bNjZX2QU=";
             };
           };
         }) {};