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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -430,9 +430,9 @@
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -440,14 +440,14 @@
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
  "terminal_size",
  "unicase",
  "unicode-width",
@@ -455,11 +455,11 @@
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.63",
@@ -467,9 +467,9 @@
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "colorchoice"
@@ -955,12 +955,6 @@
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
 name = "hermit-abi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1052,7 +1046,7 @@
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn 2.0.63",
  "unic-langid",
 ]
@@ -2195,12 +2189,6 @@
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
 name = "subtle"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2255,7 +2243,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
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
before · cmds/fleet/Cargo.toml
1[package]2name = "fleet"3description = "NixOS configuration management"4version = "0.2.0"5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]6edition = "2021"78[dependencies]9nixlike.workspace = true10better-command.workspace = true11tokio.workspace = true12anyhow = "1.0"13serde = { version = "1.0", features = ["derive"] }14serde_json = "1.0"15time = { version = "0.3", features = ["serde"] }16tempfile = "3.10"17once_cell = "1.19"18hostname = "0.3"19age-core = "0.10"20peg = "0.8"21age = { version = "0.10", features = ["ssh", "armor"] }22base64 = "0.21"23chrono = { version = "0.4", features = ["serde"] }24z85 = "3.0"25clap = { version = "4.5", features = ["derive", "env", "wrap_help", "unicode"] }26tracing = "0.1"27tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }28tokio-util = { version = "0.7", features = ["codec"] }29async-trait = "0.1"30futures = "0.3"31itertools = "0.12"32shlex = "1.3"33tabled = { version = "0.15" }34owo-colors = { version = "4.0", features = [35	"supports-color",36	"supports-colors",37] }38r2d2 = "0.8.10"39abort-on-drop = "0.2"40unindent = "0.2"41regex = "1.10"42openssh = "0.10"43crossterm = "0.27"4445tracing-indicatif = { version = "0.3", optional = true }46human-repr = { version = "1.1", optional = true }47indicatif = { version = "0.17", optional = true }4849[features]50# Not quite stable51indicatif = ["tracing-indicatif", "dep:indicatif", "human-repr", "better-command/indicatif"]
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=";
             };
           };
         }) {};