git.delta.rocks / jrsonnet / refs/commits / 8d4a7a16f575

difftreelog

build update dependencies

Yaroslav Bolyukin2022-02-16parent: #81e3c77.patch.diff
in: trunk

12 files changed

modifiedCargo.lockdiffbeforeafterboth
8source = "registry+https://github.com/rust-lang/crates.io-index"8source = "registry+https://github.com/rust-lang/crates.io-index"
9checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"9checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
10
11[[package]]
12name = "aead"
13version = "0.3.2"
14source = "registry+https://github.com/rust-lang/crates.io-index"
15checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
16dependencies = [
17 "generic-array",
18]
1910
20[[package]]11[[package]]
21name = "aead"12name = "aead"
26 "generic-array",17 "generic-array",
27]18]
28
29[[package]]
30name = "aes"
31version = "0.6.0"
32source = "registry+https://github.com/rust-lang/crates.io-index"
33checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
34dependencies = [
35 "aes-soft",
36 "aesni",
37 "cipher 0.2.5",
38]
3919
40[[package]]20[[package]]
41name = "aes"21name = "aes"
44checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"24checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
45dependencies = [25dependencies = [
46 "cfg-if",26 "cfg-if",
47 "cipher 0.3.0",27 "cipher",
48 "cpufeatures 0.2.1",28 "cpufeatures 0.2.1",
49 "ctr 0.8.0",29 "ctr",
50 "opaque-debug",30 "opaque-debug",
51]31]
52
53[[package]]
54name = "aes-ctr"
55version = "0.6.0"
56source = "registry+https://github.com/rust-lang/crates.io-index"
57checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763"
58dependencies = [
59 "aes-soft",
60 "aesni",
61 "cipher 0.2.5",
62 "ctr 0.6.0",
63]
64
65[[package]]
66name = "aes-soft"
67version = "0.6.4"
68source = "registry+https://github.com/rust-lang/crates.io-index"
69checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
70dependencies = [
71 "cipher 0.2.5",
72 "opaque-debug",
73]
74
75[[package]]
76name = "aesni"
77version = "0.10.0"
78source = "registry+https://github.com/rust-lang/crates.io-index"
79checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
80dependencies = [
81 "cipher 0.2.5",
82 "opaque-debug",
83]
84
85[[package]]
86name = "age"
87version = "0.6.0"
88source = "registry+https://github.com/rust-lang/crates.io-index"
89checksum = "16d68559c3ef40bc0fd7c3d2b156743e9387d477a68733b61dff0f6a5004ad58"
90dependencies = [
91 "aes 0.6.0",
92 "aes-ctr",
93 "age-core 0.6.0",
94 "base64",
95 "bcrypt-pbkdf 0.6.1",
96 "bech32",
97 "block-modes 0.7.0",
98 "c2-chacha",
99 "chacha20poly1305 0.7.1",
100 "cookie-factory",
101 "curve25519-dalek",
102 "hkdf",
103 "hmac 0.11.0",
104 "i18n-embed 0.12.1",
105 "i18n-embed-fl 0.5.0",
106 "lazy_static",
107 "nom 6.2.1",
108 "num-traits",
109 "pin-project",
110 "rand 0.7.3",
111 "rsa 0.3.0",
112 "rust-embed 5.9.0",
113 "scrypt 0.7.0",
114 "secrecy 0.7.0",
115 "sha2 0.9.5",
116 "subtle",
117 "x25519-dalek",
118 "zeroize",
119]
12032
121[[package]]33[[package]]
122name = "age"34name = "age"
123version = "0.7.0"35version = "0.7.1"
124source = "registry+https://github.com/rust-lang/crates.io-index"36source = "registry+https://github.com/rust-lang/crates.io-index"
125checksum = "cf320f937ccd0eb7f63450be0f071586cd918cd86785303ec1d052a3e243b550"37checksum = "23100453ca2a1bbda9bfc6deac1bebb828d7e66ba481ebccfedfddf29321b6b9"
126dependencies = [38dependencies = [
127 "aes 0.7.5",39 "aes",
128 "age-core 0.7.0",40 "age-core",
129 "base64",41 "base64",
130 "bcrypt-pbkdf 0.7.2",42 "bcrypt-pbkdf",
131 "bech32",43 "bech32",
132 "block-modes 0.8.1",44 "block-modes",
133 "chacha20poly1305 0.9.0",45 "chacha20poly1305",
134 "cookie-factory",46 "cookie-factory",
135 "curve25519-dalek",47 "curve25519-dalek",
136 "hkdf",48 "hkdf",
137 "hmac 0.11.0",49 "hmac 0.11.0",
138 "i18n-embed 0.13.1",50 "i18n-embed",
139 "i18n-embed-fl 0.6.1",51 "i18n-embed-fl",
140 "lazy_static",52 "lazy_static",
141 "nom 7.1.0",53 "nom",
142 "num-traits",54 "num-traits",
143 "pin-project",55 "pin-project",
144 "rand 0.7.3",56 "rand 0.7.3",
145 "rand 0.8.4",57 "rand 0.8.4",
146 "rsa 0.5.0",58 "rsa",
147 "rust-embed 6.3.0",59 "rust-embed",
148 "scrypt 0.8.1",60 "scrypt",
149 "sha2 0.9.5",61 "sha2 0.9.5",
150 "subtle",62 "subtle",
151 "x25519-dalek",63 "x25519-dalek",
152 "zeroize",64 "zeroize",
153]65]
154
155[[package]]
156name = "age-core"
157version = "0.6.0"
158source = "registry+https://github.com/rust-lang/crates.io-index"
159checksum = "ad65fc4325804de2e915f5a50dda38218ed49f97e1270750acef9ff8bb67ac36"
160dependencies = [
161 "base64",
162 "c2-chacha",
163 "chacha20poly1305 0.7.1",
164 "cookie-factory",
165 "hkdf",
166 "nom 6.2.1",
167 "rand 0.7.3",
168 "secrecy 0.7.0",
169 "sha2 0.9.5",
170]
17166
172[[package]]67[[package]]
173name = "age-core"68name = "age-core"
174version = "0.7.0"69version = "0.7.1"
175source = "registry+https://github.com/rust-lang/crates.io-index"70source = "registry+https://github.com/rust-lang/crates.io-index"
176checksum = "a485102f6c7a23e0666b169ba77c9ff6c6d249c05395c379be3cbab48a948e84"71checksum = "70afa630ef12a4fc666277713efbe6da2bc87bb3f3af0f1149415b701362c615"
177dependencies = [72dependencies = [
178 "base64",73 "base64",
179 "chacha20poly1305 0.9.0",74 "chacha20poly1305",
180 "cookie-factory",75 "cookie-factory",
181 "hkdf",76 "hkdf",
182 "nom 7.1.0",77 "nom",
183 "rand 0.8.4",78 "rand 0.8.4",
184 "secrecy 0.8.0",79 "secrecy",
185 "sha2 0.9.5",80 "sha2 0.9.5",
186]81]
18782
214109
215[[package]]110[[package]]
216name = "anyhow"111name = "anyhow"
217version = "1.0.44"112version = "1.0.53"
218source = "registry+https://github.com/rust-lang/crates.io-index"113source = "registry+https://github.com/rust-lang/crates.io-index"
219checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"114checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
220115
221[[package]]116[[package]]
222name = "async-trait"117name = "async-trait"
252source = "registry+https://github.com/rust-lang/crates.io-index"147source = "registry+https://github.com/rust-lang/crates.io-index"
253checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"148checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
254
255[[package]]
256name = "base58"
257version = "0.2.0"
258source = "registry+https://github.com/rust-lang/crates.io-index"
259checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
260149
261[[package]]150[[package]]
262name = "base64"151name = "base64"
270source = "registry+https://github.com/rust-lang/crates.io-index"159source = "registry+https://github.com/rust-lang/crates.io-index"
271checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c"160checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c"
272
273[[package]]
274name = "bcrypt-pbkdf"
275version = "0.6.1"
276source = "registry+https://github.com/rust-lang/crates.io-index"
277checksum = "12621b8e87feb183a6e5dbb315e49026b2229c4398797ee0ae2d1bc00aef41b9"
278dependencies = [
279 "blowfish",
280 "crypto-mac",
281 "pbkdf2 0.8.0",
282 "sha2 0.9.5",
283 "zeroize",
284]
285161
286[[package]]162[[package]]
287name = "bcrypt-pbkdf"163name = "bcrypt-pbkdf"
291dependencies = [167dependencies = [
292 "blowfish",168 "blowfish",
293 "hex-literal",169 "hex-literal",
294 "pbkdf2 0.10.0",170 "pbkdf2",
295 "sha2 0.10.0",171 "sha2 0.10.0",
296]172]
297173
307source = "registry+https://github.com/rust-lang/crates.io-index"183source = "registry+https://github.com/rust-lang/crates.io-index"
308checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"184checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
309
310[[package]]
311name = "bitvec"
312version = "0.19.5"
313source = "registry+https://github.com/rust-lang/crates.io-index"
314checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
315dependencies = [
316 "funty",
317 "radium",
318 "tap",
319 "wyz",
320]
321185
322[[package]]186[[package]]
323name = "block-buffer"187name = "block-buffer"
337 "generic-array",201 "generic-array",
338]202]
339
340[[package]]
341name = "block-modes"
342version = "0.7.0"
343source = "registry+https://github.com/rust-lang/crates.io-index"
344checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
345dependencies = [
346 "block-padding",
347 "cipher 0.2.5",
348]
349203
350[[package]]204[[package]]
351name = "block-modes"205name = "block-modes"
354checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"208checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
355dependencies = [209dependencies = [
356 "block-padding",210 "block-padding",
357 "cipher 0.3.0",211 "cipher",
358]212]
359213
360[[package]]214[[package]]
370checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"224checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"
371dependencies = [225dependencies = [
372 "byteorder",226 "byteorder",
373 "cipher 0.3.0",227 "cipher",
374 "opaque-debug",228 "opaque-debug",
375]229]
376230
377[[package]]231[[package]]
378name = "bumpalo"232name = "bumpalo"
379version = "3.7.0"233version = "3.9.1"
380source = "registry+https://github.com/rust-lang/crates.io-index"234source = "registry+https://github.com/rust-lang/crates.io-index"
381checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"235checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
382236
383[[package]]237[[package]]
384name = "byteorder"238name = "byteorder"
392source = "registry+https://github.com/rust-lang/crates.io-index"246source = "registry+https://github.com/rust-lang/crates.io-index"
393checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"247checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
394
395[[package]]
396name = "c2-chacha"
397version = "0.3.1"
398source = "registry+https://github.com/rust-lang/crates.io-index"
399checksum = "7e6002dbb7c65a76e516625443949a8b7bb0d0845fe6a3dc39e2dd7ae39dcb9c"
400dependencies = [
401 "cipher 0.2.5",
402 "ppv-lite86",
403]
404248
405[[package]]249[[package]]
406name = "cc"250name = "cc"
421checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"265checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"
422dependencies = [266dependencies = [
423 "cfg-if",267 "cfg-if",
424 "cipher 0.3.0",268 "cipher",
425 "cpufeatures 0.2.1",269 "cpufeatures 0.2.1",
426 "zeroize",270 "zeroize",
427]271]
428
429[[package]]
430name = "chacha20poly1305"
431version = "0.7.1"
432source = "registry+https://github.com/rust-lang/crates.io-index"
433checksum = "af1fc18e6d90c40164bf6c317476f2a98f04661e310e79830366b7e914c58a8e"
434dependencies = [
435 "aead 0.3.2",
436 "cipher 0.2.5",
437 "poly1305 0.6.2",
438 "zeroize",
439]
440272
441[[package]]273[[package]]
442name = "chacha20poly1305"274name = "chacha20poly1305"
443version = "0.9.0"275version = "0.9.0"
444source = "registry+https://github.com/rust-lang/crates.io-index"276source = "registry+https://github.com/rust-lang/crates.io-index"
445checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"277checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"
446dependencies = [278dependencies = [
447 "aead 0.4.3",279 "aead",
448 "chacha20",280 "chacha20",
449 "cipher 0.3.0",281 "cipher",
450 "poly1305 0.7.2",282 "poly1305",
451 "zeroize",283 "zeroize",
452]284]
453285
465 "winapi",297 "winapi",
466]298]
467
468[[package]]
469name = "cipher"
470version = "0.2.5"
471source = "registry+https://github.com/rust-lang/crates.io-index"
472checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
473dependencies = [
474 "generic-array",
475]
476299
477[[package]]300[[package]]
478name = "cipher"301name = "cipher"
528 "libc",351 "libc",
529]352]
530
531[[package]]
532name = "cpuid-bool"
533version = "0.2.0"
534source = "registry+https://github.com/rust-lang/crates.io-index"
535checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
536353
537[[package]]354[[package]]
538name = "crypto-bigint"355name = "crypto-bigint"
564 "subtle",381 "subtle",
565]382]
566
567[[package]]
568name = "ctr"
569version = "0.6.0"
570source = "registry+https://github.com/rust-lang/crates.io-index"
571checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
572dependencies = [
573 "cipher 0.2.5",
574]
575383
576[[package]]384[[package]]
577name = "ctr"385name = "ctr"
578version = "0.8.0"386version = "0.8.0"
579source = "registry+https://github.com/rust-lang/crates.io-index"387source = "registry+https://github.com/rust-lang/crates.io-index"
580checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"388checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
581dependencies = [389dependencies = [
582 "cipher 0.3.0",390 "cipher",
583]391]
584392
585[[package]]393[[package]]
638446
639[[package]]447[[package]]
640name = "dprint-core"448name = "dprint-core"
641version = "0.46.2"449version = "0.50.0"
642source = "registry+https://github.com/rust-lang/crates.io-index"450source = "registry+https://github.com/rust-lang/crates.io-index"
643checksum = "e591a70ef877cc01110ed3e28318fe98e6175fa4aaccc293857af8491c8e4f3e"451checksum = "6a596556533e5739e71dfe105c8b4496c3eccaf5aa96d14b19db2fdf4157085a"
644dependencies = [452dependencies = [
453 "anyhow",
645 "bumpalo",454 "bumpalo",
646 "fnv",455 "rustc-hash",
647 "serde",456 "serde",
648]457]
649458
673name = "fleet"482name = "fleet"
674version = "0.1.0"483version = "0.1.0"
675dependencies = [484dependencies = [
676 "age 0.7.0",485 "age",
677 "age-core 0.7.0",486 "age-core",
678 "anyhow",487 "anyhow",
679 "async-trait",488 "async-trait",
680 "base58",
681 "base64",489 "base64",
682 "chrono",490 "chrono",
683 "futures",491 "futures",
701name = "fleet-install-secrets"509name = "fleet-install-secrets"
702version = "0.1.0"510version = "0.1.0"
703dependencies = [511dependencies = [
704 "age 0.6.0",512 "age",
705 "anyhow",513 "anyhow",
706 "env_logger",514 "env_logger",
707 "log",515 "log",
713 "z85",521 "z85",
714]522]
715
716[[package]]
717name = "fluent"
718version = "0.15.0"
719source = "registry+https://github.com/rust-lang/crates.io-index"
720checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a"
721dependencies = [
722 "fluent-bundle",
723 "unic-langid",
724]
725523
726[[package]]524[[package]]
727name = "fluent"525name = "fluent"
767 "thiserror",565 "thiserror",
768]566]
769
770[[package]]
771name = "fnv"
772version = "1.0.7"
773source = "registry+https://github.com/rust-lang/crates.io-index"
774checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
775
776[[package]]
777name = "funty"
778version = "1.1.0"
779source = "registry+https://github.com/rust-lang/crates.io-index"
780checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
781567
782[[package]]568[[package]]
783name = "futures"569name = "futures"
989 "unic-langid",775 "unic-langid",
990]776]
991
992[[package]]
993name = "i18n-embed"
994version = "0.12.1"
995source = "registry+https://github.com/rust-lang/crates.io-index"
996checksum = "3794c3d7fea43e076281c9213cfaaa7a53c3f18b1613f12514b9f575a2908457"
997dependencies = [
998 "fluent 0.15.0",
999 "fluent-langneg",
1000 "fluent-syntax",
1001 "i18n-embed-impl 0.7.0",
1002 "intl-memoizer",
1003 "lazy_static",
1004 "log",
1005 "parking_lot",
1006 "rust-embed 5.9.0",
1007 "thiserror",
1008 "unic-langid",
1009 "walkdir",
1010]
1011777
1012[[package]]778[[package]]
1013name = "i18n-embed"779name = "i18n-embed"
1014version = "0.13.1"780version = "0.13.1"
1015source = "registry+https://github.com/rust-lang/crates.io-index"781source = "registry+https://github.com/rust-lang/crates.io-index"
1016checksum = "39a0b4598fcd199eb5da38f70ece82903b178ad638839661c00612719bcfc0ad"782checksum = "39a0b4598fcd199eb5da38f70ece82903b178ad638839661c00612719bcfc0ad"
1017dependencies = [783dependencies = [
1018 "fluent 0.16.0",784 "fluent",
1019 "fluent-langneg",785 "fluent-langneg",
1020 "fluent-syntax",786 "fluent-syntax",
1021 "i18n-embed-impl 0.8.0",787 "i18n-embed-impl",
1022 "intl-memoizer",788 "intl-memoizer",
1023 "lazy_static",789 "lazy_static",
1024 "log",790 "log",
1025 "parking_lot",791 "parking_lot",
1026 "rust-embed 6.3.0",792 "rust-embed",
1027 "thiserror",793 "thiserror",
1028 "unic-langid",794 "unic-langid",
1029 "walkdir",795 "walkdir",
1030]796]
1031
1032[[package]]
1033name = "i18n-embed-fl"
1034version = "0.5.0"
1035source = "registry+https://github.com/rust-lang/crates.io-index"
1036checksum = "4d91f4951bd0bc19624a06781bf8cd05bdd59057622e5d4240823b42a5f102d2"
1037dependencies = [
1038 "dashmap",
1039 "find-crate",
1040 "fluent 0.15.0",
1041 "fluent-syntax",
1042 "i18n-config",
1043 "i18n-embed 0.12.1",
1044 "lazy_static",
1045 "proc-macro-error",
1046 "proc-macro2",
1047 "quote",
1048 "strsim 0.10.0",
1049 "syn",
1050 "unic-langid",
1051]
1052797
1053[[package]]798[[package]]
1054name = "i18n-embed-fl"799name = "i18n-embed-fl"
1058dependencies = [803dependencies = [
1059 "dashmap",804 "dashmap",
1060 "find-crate",805 "find-crate",
1061 "fluent 0.16.0",806 "fluent",
1062 "fluent-syntax",807 "fluent-syntax",
1063 "i18n-config",808 "i18n-config",
1064 "i18n-embed 0.13.1",809 "i18n-embed",
1065 "lazy_static",810 "lazy_static",
1066 "proc-macro-error",811 "proc-macro-error",
1067 "proc-macro2",812 "proc-macro2",
1071 "unic-langid",816 "unic-langid",
1072]817]
1073
1074[[package]]
1075name = "i18n-embed-impl"
1076version = "0.7.0"
1077source = "registry+https://github.com/rust-lang/crates.io-index"
1078checksum = "2757ae6d1dd47fba009e86795350186fc4740a6e53a1b4f336a8a6725d20eb53"
1079dependencies = [
1080 "find-crate",
1081 "i18n-config",
1082 "proc-macro2",
1083 "quote",
1084 "syn",
1085]
1086818
1087[[package]]819[[package]]
1088name = "i18n-embed-impl"820name = "i18n-embed-impl"
1237969
1238[[package]]970[[package]]
1239name = "nix"971name = "nix"
1240version = "0.22.1"972version = "0.23.1"
1241source = "registry+https://github.com/rust-lang/crates.io-index"973source = "registry+https://github.com/rust-lang/crates.io-index"
1242checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031"974checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
1243dependencies = [975dependencies = [
1244 "bitflags",976 "bitflags",
1245 "cc",977 "cc",
1259 "thiserror",991 "thiserror",
1260]992]
1261
1262[[package]]
1263name = "nom"
1264version = "6.2.1"
1265source = "registry+https://github.com/rust-lang/crates.io-index"
1266checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
1267dependencies = [
1268 "bitvec",
1269 "funty",
1270 "memchr",
1271 "version_check",
1272]
1273993
1274[[package]]994[[package]]
1275name = "nom"995name = "nom"
1291 "winapi",1011 "winapi",
1292]1012]
1293
1294[[package]]
1295name = "num-bigint"
1296version = "0.2.6"
1297source = "registry+https://github.com/rust-lang/crates.io-index"
1298checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
1299dependencies = [
1300 "autocfg 1.0.1",
1301 "num-integer",
1302 "num-traits",
1303]
1304
1305[[package]]
1306name = "num-bigint-dig"
1307version = "0.6.1"
1308source = "registry+https://github.com/rust-lang/crates.io-index"
1309checksum = "5d51546d704f52ef14b3c962b5776e53d5b862e5790e40a350d366c209bd7f7a"
1310dependencies = [
1311 "autocfg 0.1.7",
1312 "byteorder",
1313 "lazy_static",
1314 "libm",
1315 "num-integer",
1316 "num-iter",
1317 "num-traits",
1318 "rand 0.7.3",
1319 "serde",
1320 "smallvec",
1321 "zeroize",
1322]
13231013
1324[[package]]1014[[package]]
1325name = "num-bigint-dig"1015name = "num-bigint-dig"
1440 "winapi",1130 "winapi",
1441]1131]
1442
1443[[package]]
1444name = "pbkdf2"
1445version = "0.8.0"
1446source = "registry+https://github.com/rust-lang/crates.io-index"
1447checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
1448dependencies = [
1449 "crypto-mac",
1450]
14511132
1452[[package]]1133[[package]]
1453name = "pbkdf2"1134name = "pbkdf2"
14601141
1461[[package]]1142[[package]]
1462name = "peg"1143name = "peg"
1463version = "0.7.0"1144version = "0.8.0"
1464source = "registry+https://github.com/rust-lang/crates.io-index"1145source = "registry+https://github.com/rust-lang/crates.io-index"
1465checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"1146checksum = "af728fe826811af3b38c37e93de6d104485953ea373d656eebae53d6987fcd2c"
1466dependencies = [1147dependencies = [
1467 "peg-macros",1148 "peg-macros",
1468 "peg-runtime",1149 "peg-runtime",
1469]1150]
14701151
1471[[package]]1152[[package]]
1472name = "peg-macros"1153name = "peg-macros"
1473version = "0.7.0"1154version = "0.8.0"
1474source = "registry+https://github.com/rust-lang/crates.io-index"1155source = "registry+https://github.com/rust-lang/crates.io-index"
1475checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"1156checksum = "4536be147b770b824895cbad934fccce8e49f14b4c4946eaa46a6e4a12fcdc16"
1476dependencies = [1157dependencies = [
1477 "peg-runtime",1158 "peg-runtime",
1478 "proc-macro2",1159 "proc-macro2",
14811162
1482[[package]]1163[[package]]
1483name = "peg-runtime"1164name = "peg-runtime"
1484version = "0.7.0"1165version = "0.8.0"
1485source = "registry+https://github.com/rust-lang/crates.io-index"1166source = "registry+https://github.com/rust-lang/crates.io-index"
1486checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"1167checksum = "f9b0efd3ba03c3a409d44d60425f279ec442bcf0b9e63ff4e410da31c8b0f69f"
1487
1488[[package]]
1489name = "pem"
1490version = "0.8.3"
1491source = "registry+https://github.com/rust-lang/crates.io-index"
1492checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
1493dependencies = [
1494 "base64",
1495 "once_cell",
1496 "regex",
1497]
14981168
1499[[package]]1169[[package]]
1500name = "pem-rfc7468"1170name = "pem-rfc7468"
1561 "zeroize",1231 "zeroize",
1562]1232]
1563
1564[[package]]
1565name = "poly1305"
1566version = "0.6.2"
1567source = "registry+https://github.com/rust-lang/crates.io-index"
1568checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
1569dependencies = [
1570 "cpuid-bool",
1571 "universal-hash",
1572]
15731233
1574[[package]]1234[[package]]
1575name = "poly1305"1235name = "poly1305"
1642 "proc-macro2",1302 "proc-macro2",
1643]1303]
1644
1645[[package]]
1646name = "radium"
1647version = "0.5.3"
1648source = "registry+https://github.com/rust-lang/crates.io-index"
1649checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
16501304
1651[[package]]1305[[package]]
1652name = "rand"1306name = "rand"
1773 "winapi",1427 "winapi",
1774]1428]
1775
1776[[package]]
1777name = "rsa"
1778version = "0.3.0"
1779source = "registry+https://github.com/rust-lang/crates.io-index"
1780checksum = "3648b669b10afeab18972c105e284a7b953a669b0be3514c27f9b17acab2f9cd"
1781dependencies = [
1782 "byteorder",
1783 "digest 0.9.0",
1784 "lazy_static",
1785 "num-bigint-dig 0.6.1",
1786 "num-integer",
1787 "num-iter",
1788 "num-traits",
1789 "pem",
1790 "rand 0.7.3",
1791 "sha2 0.9.5",
1792 "simple_asn1",
1793 "subtle",
1794 "thiserror",
1795 "zeroize",
1796]
17971429
1798[[package]]1430[[package]]
1799name = "rsa"1431name = "rsa"
1804 "byteorder",1436 "byteorder",
1805 "digest 0.9.0",1437 "digest 0.9.0",
1806 "lazy_static",1438 "lazy_static",
1807 "num-bigint-dig 0.7.0",1439 "num-bigint-dig",
1808 "num-integer",1440 "num-integer",
1809 "num-iter",1441 "num-iter",
1810 "num-traits",1442 "num-traits",
1815 "zeroize",1447 "zeroize",
1816]1448]
1817
1818[[package]]
1819name = "rust-embed"
1820version = "5.9.0"
1821source = "registry+https://github.com/rust-lang/crates.io-index"
1822checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523"
1823dependencies = [
1824 "rust-embed-impl 5.9.0",
1825 "rust-embed-utils 5.1.0",
1826 "walkdir",
1827]
18281449
1829[[package]]1450[[package]]
1830name = "rust-embed"1451name = "rust-embed"
1831version = "6.3.0"1452version = "6.3.0"
1832source = "registry+https://github.com/rust-lang/crates.io-index"1453source = "registry+https://github.com/rust-lang/crates.io-index"
1833checksum = "d40377bff8cceee81e28ddb73ac97f5c2856ce5522f0b260b763f434cdfae602"1454checksum = "d40377bff8cceee81e28ddb73ac97f5c2856ce5522f0b260b763f434cdfae602"
1834dependencies = [1455dependencies = [
1835 "rust-embed-impl 6.2.0",1456 "rust-embed-impl",
1836 "rust-embed-utils 7.1.0",1457 "rust-embed-utils",
1837 "walkdir",1458 "walkdir",
1838]1459]
1839
1840[[package]]
1841name = "rust-embed-impl"
1842version = "5.9.0"
1843source = "registry+https://github.com/rust-lang/crates.io-index"
1844checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66"
1845dependencies = [
1846 "proc-macro2",
1847 "quote",
1848 "rust-embed-utils 5.1.0",
1849 "syn",
1850 "walkdir",
1851]
18521460
1853[[package]]1461[[package]]
1854name = "rust-embed-impl"1462name = "rust-embed-impl"
1858dependencies = [1466dependencies = [
1859 "proc-macro2",1467 "proc-macro2",
1860 "quote",1468 "quote",
1861 "rust-embed-utils 7.1.0",1469 "rust-embed-utils",
1862 "syn",1470 "syn",
1863 "walkdir",1471 "walkdir",
1864]1472]
1865
1866[[package]]
1867name = "rust-embed-utils"
1868version = "5.1.0"
1869source = "registry+https://github.com/rust-lang/crates.io-index"
1870checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d"
1871dependencies = [
1872 "walkdir",
1873]
18741473
1875[[package]]1474[[package]]
1876name = "rust-embed-utils"1475name = "rust-embed-utils"
1894source = "registry+https://github.com/rust-lang/crates.io-index"1493source = "registry+https://github.com/rust-lang/crates.io-index"
1895checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"1494checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
1896
1897[[package]]
1898name = "salsa20"
1899version = "0.8.1"
1900source = "registry+https://github.com/rust-lang/crates.io-index"
1901checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0"
1902dependencies = [
1903 "cipher 0.3.0",
1904]
19051495
1906[[package]]1496[[package]]
1907name = "salsa20"1497name = "salsa20"
1908version = "0.9.0"1498version = "0.9.0"
1909source = "registry+https://github.com/rust-lang/crates.io-index"1499source = "registry+https://github.com/rust-lang/crates.io-index"
1910checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"1500checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"
1911dependencies = [1501dependencies = [
1912 "cipher 0.3.0",1502 "cipher",
1913]1503]
19141504
1915[[package]]1505[[package]]
1927source = "registry+https://github.com/rust-lang/crates.io-index"1517source = "registry+https://github.com/rust-lang/crates.io-index"
1928checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"1518checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
1929
1930[[package]]
1931name = "scrypt"
1932version = "0.7.0"
1933source = "registry+https://github.com/rust-lang/crates.io-index"
1934checksum = "879588d8f90906e73302547e20fffefdd240eb3e0e744e142321f5d49dea0518"
1935dependencies = [
1936 "hmac 0.11.0",
1937 "pbkdf2 0.8.0",
1938 "salsa20 0.8.1",
1939 "sha2 0.9.5",
1940]
19411519
1942[[package]]1520[[package]]
1943name = "scrypt"1521name = "scrypt"
1946checksum = "e73d6d7c6311ebdbd9184ad6c4447b2f36337e327bda107d3ba9e3c374f9d325"1524checksum = "e73d6d7c6311ebdbd9184ad6c4447b2f36337e327bda107d3ba9e3c374f9d325"
1947dependencies = [1525dependencies = [
1948 "hmac 0.12.0",1526 "hmac 0.12.0",
1949 "pbkdf2 0.10.0",1527 "pbkdf2",
1950 "salsa20 0.9.0",1528 "salsa20",
1951 "sha2 0.10.0",1529 "sha2 0.10.0",
1952]1530]
1953
1954[[package]]
1955name = "secrecy"
1956version = "0.7.0"
1957source = "registry+https://github.com/rust-lang/crates.io-index"
1958checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0"
1959dependencies = [
1960 "zeroize",
1961]
19621531
1963[[package]]1532[[package]]
1964name = "secrecy"1533name = "secrecy"
2042 "libc",1611 "libc",
2043]1612]
2044
2045[[package]]
2046name = "simple_asn1"
2047version = "0.4.1"
2048source = "registry+https://github.com/rust-lang/crates.io-index"
2049checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b"
2050dependencies = [
2051 "chrono",
2052 "num-bigint",
2053 "num-traits",
2054]
20551613
2056[[package]]1614[[package]]
2057name = "slab"1615name = "slab"
2151 "unicode-xid",1709 "unicode-xid",
2152]1710]
2153
2154[[package]]
2155name = "tap"
2156version = "1.0.1"
2157source = "registry+https://github.com/rust-lang/crates.io-index"
2158checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
21591711
2160[[package]]1712[[package]]
2161name = "tempfile"1713name = "tempfile"
22771829
2278[[package]]1830[[package]]
2279name = "tokio-util"1831name = "tokio-util"
2280version = "0.6.9"1832version = "0.7.0"
2281source = "registry+https://github.com/rust-lang/crates.io-index"1833source = "registry+https://github.com/rust-lang/crates.io-index"
2282checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"1834checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1"
2283dependencies = [1835dependencies = [
2284 "bytes",1836 "bytes",
2285 "futures-core",1837 "futures-core",
2487source = "registry+https://github.com/rust-lang/crates.io-index"2039source = "registry+https://github.com/rust-lang/crates.io-index"
2488checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"2040checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
2489
2490[[package]]
2491name = "wyz"
2492version = "0.2.0"
2493source = "registry+https://github.com/rust-lang/crates.io-index"
2494checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
24952041
2496[[package]]2042[[package]]
2497name = "x25519-dalek"2043name = "x25519-dalek"
modifiedcmds/fleet/Cargo.tomldiffbeforeafterboth
3description = "NixOS configuration management"3description = "NixOS configuration management"
4version = "0.1.0"4version = "0.1.0"
5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]5authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
6edition = "2018"6edition = "2021"
77
8[dependencies]8[dependencies]
9anyhow = "1.0"9anyhow = "1.0"
14once_cell = "1.5"14once_cell = "1.5"
15hostname = "0.3.1"15hostname = "0.3.1"
16age-core = "0.7.0"16age-core = "0.7.0"
17peg = "0.7.0"17peg = "0.8.0"
18nixlike = {path = "../../crates/nixlike"}18nixlike = {path = "../../crates/nixlike"}
19age = { version = "0.7.0", features = ["ssh", "armor"] }19age = { version = "0.7.0", features = ["ssh", "armor"] }
20base64 = "0.13.0"20base64 = "0.13.0"
21chrono = { version = "0.4.19", features = ["serde"] }21chrono = { version = "0.4.19", features = ["serde"] }
22z85 = "3.0.3"22z85 = "3.0.3"
23base58 = "*"
24structopt = "0.3.23"23structopt = "0.3.23"
25tokio = { version = "1.14.0", features = ["full"] }24tokio = { version = "1.14.0", features = ["full"] }
26tracing = "0.1.29"25tracing = "0.1.29"
27tracing-subscriber = { version = "0.3.3", features = ["fmt", "env-filter"] }26tracing-subscriber = { version = "0.3.3", features = ["fmt", "env-filter"] }
28tokio-util = { version = "0.6.9", features = ["codec"] }27tokio-util = { version = "0.7.0", features = ["codec"] }
29async-trait = "0.1.52"28async-trait = "0.1.52"
30futures = "0.3.17"29futures = "0.3.17"
3130
modifiedcmds/fleet/src/cmds/mod.rsdiffbeforeafterboth
1pub mod build_systems;1pub mod build_systems;
2pub mod secrets;2pub mod info;
3pub mod info;3pub mod secrets;
44
modifiedcmds/fleet/src/command.rsdiffbeforeafterboth
153 NixLog::Start { text, level: 0, typ: 108, .. } if text == "" => {153 NixLog::Start { text, level: 0, typ: 108, .. } if text == "" => {
154 // Cache lookup? Coupled with copy log154 // Cache lookup? Coupled with copy log
155 },155 },
156 NixLog::Start { text, level: 4, typ: 101, .. } if text.starts_with("downloading ") => {156 NixLog::Start { text, level: 4, typ: 109, .. } if text.starts_with("querying info about ") => {
157 // Cache lookup
158 }
159 NixLog::Start { text, level: 4, typ: 101, .. } if text.starts_with("downloading ") => {
157 // NAR downloading, coupled with copy log160 // NAR downloading, coupled with copy log
158 }161 }
162 NixLog::Start { text, level: 1, typ: 111, .. } if text.starts_with("waiting for a machine to build ") => {
163 // Useless repeating notification about build
164 }
159 NixLog::Stop { .. } => {},165 NixLog::Stop { .. } => {},
160 NixLog::Result { .. } => {},166 NixLog::Result { .. } => {},
161 _ => warn!("unknown log: {:?}", log)167 _ => warn!("unknown log: {:?}", log)
modifiedcmds/fleet/src/host.rsdiffbeforeafterboth

no syntactic changes

modifiedcmds/fleet/src/main.rsdiffbeforeafterboth
1pub mod cmds;
1pub mod command;2pub mod command;
2pub mod host;3pub mod host;
3pub mod keys;4pub mod keys;
4pub mod cmds;
55
6mod fleetdata;6mod fleetdata;
77
modifiedcmds/install-secrets/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "fleet-install-secrets"2name = "fleet-install-secrets"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7age = { version = "0.6.0", features = ["ssh"] }7age = { version = "0.7.1", features = ["ssh"] }
8anyhow = "1.0.44"8anyhow = "1.0.44"
9env_logger = "0.9.0"9env_logger = "0.9.0"
10log = "0.4.14"10log = "0.4.14"
11nix = "0.22.1"11nix = "0.23.1"
12serde = "1.0.130"12serde = "1.0.130"
13serde_json = "1.0.68"13serde_json = "1.0.68"
14structopt = "0.3.23"14structopt = "0.3.23"
modifiedcrates/nixlike/Cargo.tomldiffbeforeafterboth
1[package]1[package]
2name = "nixlike"2name = "nixlike"
3version = "0.1.0"3version = "0.1.0"
4edition = "2018"4edition = "2021"
55
6[dependencies]6[dependencies]
7dprint-core = "0.46.2"7dprint-core = "0.50.0"
8linked-hash-map = "0.5.4"8linked-hash-map = "0.5.4"
9peg = "0.7.0"9peg = "0.8.0"
10serde = "1.0.130"10serde = "1.0.130"
11thiserror = "1.0.29"11thiserror = "1.0.29"
1212
modifiedcrates/nixlike/fuzz/Cargo.tomldiffbeforeafterboth
4version = "0.0.0"4version = "0.0.0"
5authors = ["Automatically generated"]5authors = ["Automatically generated"]
6publish = false6publish = false
7edition = "2018"7edition = "2021"
88
9[package.metadata]9[package.metadata]
10cargo-fuzz = true10cargo-fuzz = true
modifiedcrates/nixlike/src/lib.rsdiffbeforeafterboth
1//! Serialization/deserialization for nix subset usable for static configurations
2//! Serialized results from this library are readable by both this library and standard nix tools
3
1use linked_hash_map::LinkedHashMap;4use linked_hash_map::LinkedHashMap;
2use peg::str::LineCol;5use peg::str::LineCol;
deletedflake.lockdiffbeforeafterboth

no changes

modifiedflake.nixdiffbeforeafterboth
15 inherit system; overlays = [ (import rust-overlay) ];15 inherit system; overlays = [ (import rust-overlay) ];
16 };16 };
17 llvmPkgs = pkgs.buildPackages.llvmPackages_11;17 llvmPkgs = pkgs.buildPackages.llvmPackages_11;
18 rust = (pkgs.rustChannelOf { date = "2021-08-16"; channel = "nightly"; }).default.override { extensions = [ "rust-src" ]; };18 rust = (pkgs.rustChannelOf { date = "2022-02-02"; channel = "nightly"; }).default.override { extensions = [ "rust-src" ]; };
19 rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };19 rustPlatform = pkgs.makeRustPlatform { cargo = rust; rustc = rust; };
20 in20 in
21 {21 {