git.iko.soy/typeable/nixpkgs
on master help sign in
b3sum: 0.3.7 -> 0.3.8
commit42d671a80d2cf80b25adb3d296dc36df2136c93c authorVladyslav M <dywedir@gra.red> dateFri 28 May 2021, 22:13 (5 years ago) parentf451461
3 files changed+6−544
pkgs/tools/security/b3sum/cargo-lock.patch−513 pkgs/tools/security/b3sum/default.nix+6−12 pkgs/tools/security/b3sum/update-cargo-lock.sh−19
pkgs/tools/security/b3sum/cargo-lock.patchdeleted−513
@@ -1,513 +0,0 @@
1−diff --git a/Cargo.lock b/Cargo.lock
2−new file mode 100644
3−index 0000000..1dff162
4−--- /dev/null
5−+++ b/Cargo.lock
6−@@ -0,0 +1,507 @@
7−+# This file is automatically @generated by Cargo.
8−+# It is not intended for manual editing.
9−+[[package]]
10−+name = "ansi_term"
11−+version = "0.11.0"
12−+source = "registry+https://github.com/rust-lang/crates.io-index"
13−+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
14−+dependencies = [
15−+ "winapi",
16−+]
17−+
18−+[[package]]
19−+name = "anyhow"
20−+version = "1.0.34"
21−+source = "registry+https://github.com/rust-lang/crates.io-index"
22−+checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
23−+
24−+[[package]]
25−+name = "arrayref"
26−+version = "0.3.6"
27−+source = "registry+https://github.com/rust-lang/crates.io-index"
28−+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
29−+
30−+[[package]]
31−+name = "arrayvec"
32−+version = "0.5.2"
33−+source = "registry+https://github.com/rust-lang/crates.io-index"
34−+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
35−+
36−+[[package]]
37−+name = "atty"
38−+version = "0.2.14"
39−+source = "registry+https://github.com/rust-lang/crates.io-index"
40−+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
41−+dependencies = [
42−+ "hermit-abi",
43−+ "libc",
44−+ "winapi",
45−+]
46−+
47−+[[package]]
48−+name = "autocfg"
49−+version = "1.0.1"
50−+source = "registry+https://github.com/rust-lang/crates.io-index"
51−+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
52−+
53−+[[package]]
54−+name = "b3sum"
55−+version = "0.3.7"
56−+dependencies = [
57−+ "anyhow",
58−+ "blake3",
59−+ "clap",
60−+ "duct",
61−+ "hex",
62−+ "memmap",
63−+ "rayon",
64−+ "tempfile",
65−+ "wild",
66−+]
67−+
68−+[[package]]
69−+name = "bitflags"
70−+version = "1.2.1"
71−+source = "registry+https://github.com/rust-lang/crates.io-index"
72−+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
73−+
74−+[[package]]
75−+name = "blake3"
76−+version = "0.3.7"
77−+dependencies = [
78−+ "arrayref",
79−+ "arrayvec",
80−+ "cc",
81−+ "cfg-if 0.1.10",
82−+ "constant_time_eq",
83−+ "crypto-mac",
84−+ "digest",
85−+ "rayon",
86−+]
87−+
88−+[[package]]
89−+name = "cc"
90−+version = "1.0.62"
91−+source = "registry+https://github.com/rust-lang/crates.io-index"
92−+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
93−+
94−+[[package]]
95−+name = "cfg-if"
96−+version = "0.1.10"
97−+source = "registry+https://github.com/rust-lang/crates.io-index"
98−+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
99−+
100−+[[package]]
101−+name = "cfg-if"
102−+version = "1.0.0"
103−+source = "registry+https://github.com/rust-lang/crates.io-index"
104−+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
105−+
106−+[[package]]
107−+name = "clap"
108−+version = "2.33.3"
109−+source = "registry+https://github.com/rust-lang/crates.io-index"
110−+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
111−+dependencies = [
112−+ "ansi_term",
113−+ "atty",
114−+ "bitflags",
115−+ "strsim",
116−+ "textwrap",
117−+ "unicode-width",
118−+ "vec_map",
119−+]
120−+
121−+[[package]]
122−+name = "const_fn"
123−+version = "0.4.3"
124−+source = "registry+https://github.com/rust-lang/crates.io-index"
125−+checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
126−+
127−+[[package]]
128−+name = "constant_time_eq"
129−+version = "0.1.5"
130−+source = "registry+https://github.com/rust-lang/crates.io-index"
131−+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
132−+
133−+[[package]]
134−+name = "crossbeam-channel"
135−+version = "0.5.0"
136−+source = "registry+https://github.com/rust-lang/crates.io-index"
137−+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
138−+dependencies = [
139−+ "cfg-if 1.0.0",
140−+ "crossbeam-utils",
141−+]
142−+
143−+[[package]]
144−+name = "crossbeam-deque"
145−+version = "0.8.0"
146−+source = "registry+https://github.com/rust-lang/crates.io-index"
147−+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
148−+dependencies = [
149−+ "cfg-if 1.0.0",
150−+ "crossbeam-epoch",
151−+ "crossbeam-utils",
152−+]
153−+
154−+[[package]]
155−+name = "crossbeam-epoch"
156−+version = "0.9.0"
157−+source = "registry+https://github.com/rust-lang/crates.io-index"
158−+checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
159−+dependencies = [
160−+ "cfg-if 1.0.0",
161−+ "const_fn",
162−+ "crossbeam-utils",
163−+ "lazy_static",
164−+ "memoffset",
165−+ "scopeguard",
166−+]
167−+
168−+[[package]]
169−+name = "crossbeam-utils"
170−+version = "0.8.0"
171−+source = "registry+https://github.com/rust-lang/crates.io-index"
172−+checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
173−+dependencies = [
174−+ "autocfg",
175−+ "cfg-if 1.0.0",
176−+ "const_fn",
177−+ "lazy_static",
178−+]
179−+
180−+[[package]]
181−+name = "crypto-mac"
182−+version = "0.8.0"
183−+source = "registry+https://github.com/rust-lang/crates.io-index"
184−+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
185−+dependencies = [
186−+ "generic-array",
187−+ "subtle",
188−+]
189−+
190−+[[package]]
191−+name = "digest"
192−+version = "0.9.0"
193−+source = "registry+https://github.com/rust-lang/crates.io-index"
194−+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
195−+dependencies = [
196−+ "generic-array",
197−+]
198−+
199−+[[package]]
200−+name = "duct"
201−+version = "0.13.4"
202−+source = "registry+https://github.com/rust-lang/crates.io-index"
203−+checksum = "f90a9c3a25aafbd538c7d40a53f83c4487ee8216c12d1c8ef2c01eb2f6ea1553"
204−+dependencies = [
205−+ "libc",
206−+ "once_cell",
207−+ "os_pipe",
208−+ "shared_child",
209−+]
210−+
211−+[[package]]
212−+name = "either"
213−+version = "1.6.1"
214−+source = "registry+https://github.com/rust-lang/crates.io-index"
215−+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
216−+
217−+[[package]]
218−+name = "generic-array"
219−+version = "0.14.4"
220−+source = "registry+https://github.com/rust-lang/crates.io-index"
221−+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
222−+dependencies = [
223−+ "typenum",
224−+ "version_check",
225−+]
226−+
227−+[[package]]
228−+name = "getrandom"
229−+version = "0.1.15"
230−+source = "registry+https://github.com/rust-lang/crates.io-index"
231−+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
232−+dependencies = [
233−+ "cfg-if 0.1.10",
234−+ "libc",
235−+ "wasi",
236−+]
237−+
238−+[[package]]
239−+name = "glob"
240−+version = "0.3.0"
241−+source = "registry+https://github.com/rust-lang/crates.io-index"
242−+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
243−+
244−+[[package]]
245−+name = "hermit-abi"
246−+version = "0.1.17"
247−+source = "registry+https://github.com/rust-lang/crates.io-index"
248−+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
249−+dependencies = [
250−+ "libc",
251−+]
252−+
253−+[[package]]
254−+name = "hex"
255−+version = "0.4.2"
256−+source = "registry+https://github.com/rust-lang/crates.io-index"
257−+checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
258−+
259−+[[package]]
260−+name = "lazy_static"
261−+version = "1.4.0"
262−+source = "registry+https://github.com/rust-lang/crates.io-index"
263−+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
264−+
265−+[[package]]
266−+name = "libc"
267−+version = "0.2.80"
268−+source = "registry+https://github.com/rust-lang/crates.io-index"
269−+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
270−+
271−+[[package]]
272−+name = "memmap"
273−+version = "0.7.0"
274−+source = "registry+https://github.com/rust-lang/crates.io-index"
275−+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
276−+dependencies = [
277−+ "libc",
278−+ "winapi",
279−+]
280−+
281−+[[package]]
282−+name = "memoffset"
283−+version = "0.5.6"
284−+source = "registry+https://github.com/rust-lang/crates.io-index"
285−+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
286−+dependencies = [
287−+ "autocfg",
288−+]
289−+
290−+[[package]]
291−+name = "num_cpus"
292−+version = "1.13.0"
293−+source = "registry+https://github.com/rust-lang/crates.io-index"
294−+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
295−+dependencies = [
296−+ "hermit-abi",
297−+ "libc",
298−+]
299−+
300−+[[package]]
301−+name = "once_cell"
302−+version = "1.5.2"
303−+source = "registry+https://github.com/rust-lang/crates.io-index"
304−+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
305−+
306−+[[package]]
307−+name = "os_pipe"
308−+version = "0.9.2"
309−+source = "registry+https://github.com/rust-lang/crates.io-index"
310−+checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213"
311−+dependencies = [
312−+ "libc",
313−+ "winapi",
314−+]
315−+
316−+[[package]]
317−+name = "ppv-lite86"
318−+version = "0.2.10"
319−+source = "registry+https://github.com/rust-lang/crates.io-index"
320−+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
321−+
322−+[[package]]
323−+name = "rand"
324−+version = "0.7.3"
325−+source = "registry+https://github.com/rust-lang/crates.io-index"
326−+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
327−+dependencies = [
328−+ "getrandom",
329−+ "libc",
330−+ "rand_chacha",
331−+ "rand_core",
332−+ "rand_hc",
333−+]
334−+
335−+[[package]]
336−+name = "rand_chacha"
337−+version = "0.2.2"
338−+source = "registry+https://github.com/rust-lang/crates.io-index"
339−+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
340−+dependencies = [
341−+ "ppv-lite86",
342−+ "rand_core",
343−+]
344−+
345−+[[package]]
346−+name = "rand_core"
347−+version = "0.5.1"
348−+source = "registry+https://github.com/rust-lang/crates.io-index"
349−+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
350−+dependencies = [
351−+ "getrandom",
352−+]
353−+
354−+[[package]]
355−+name = "rand_hc"
356−+version = "0.2.0"
357−+source = "registry+https://github.com/rust-lang/crates.io-index"
358−+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
359−+dependencies = [
360−+ "rand_core",
361−+]
362−+
363−+[[package]]
364−+name = "rayon"
365−+version = "1.5.0"
366−+source = "registry+https://github.com/rust-lang/crates.io-index"
367−+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
368−+dependencies = [
369−+ "autocfg",
370−+ "crossbeam-deque",
371−+ "either",
372−+ "rayon-core",
373−+]
374−+
375−+[[package]]
376−+name = "rayon-core"
377−+version = "1.9.0"
378−+source = "registry+https://github.com/rust-lang/crates.io-index"
379−+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
380−+dependencies = [
381−+ "crossbeam-channel",
382−+ "crossbeam-deque",
383−+ "crossbeam-utils",
384−+ "lazy_static",
385−+ "num_cpus",
386−+]
387−+
388−+[[package]]
389−+name = "redox_syscall"
390−+version = "0.1.57"
391−+source = "registry+https://github.com/rust-lang/crates.io-index"
392−+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
393−+
394−+[[package]]
395−+name = "remove_dir_all"
396−+version = "0.5.3"
397−+source = "registry+https://github.com/rust-lang/crates.io-index"
398−+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
399−+dependencies = [
400−+ "winapi",
401−+]
402−+
403−+[[package]]
404−+name = "scopeguard"
405−+version = "1.1.0"
406−+source = "registry+https://github.com/rust-lang/crates.io-index"
407−+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
408−+
409−+[[package]]
410−+name = "shared_child"
411−+version = "0.3.4"
412−+source = "registry+https://github.com/rust-lang/crates.io-index"
413−+checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2"
414−+dependencies = [
415−+ "libc",
416−+ "winapi",
417−+]
418−+
419−+[[package]]
420−+name = "strsim"
421−+version = "0.8.0"
422−+source = "registry+https://github.com/rust-lang/crates.io-index"
423−+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
424−+
425−+[[package]]
426−+name = "subtle"
427−+version = "2.3.0"
428−+source = "registry+https://github.com/rust-lang/crates.io-index"
429−+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
430−+
431−+[[package]]
432−+name = "tempfile"
433−+version = "3.1.0"
434−+source = "registry+https://github.com/rust-lang/crates.io-index"
435−+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
436−+dependencies = [
437−+ "cfg-if 0.1.10",
438−+ "libc",
439−+ "rand",
440−+ "redox_syscall",
441−+ "remove_dir_all",
442−+ "winapi",
443−+]
444−+
445−+[[package]]
446−+name = "textwrap"
447−+version = "0.11.0"
448−+source = "registry+https://github.com/rust-lang/crates.io-index"
449−+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
450−+dependencies = [
451−+ "unicode-width",
452−+]
453−+
454−+[[package]]
455−+name = "typenum"
456−+version = "1.12.0"
457−+source = "registry+https://github.com/rust-lang/crates.io-index"
458−+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
459−+
460−+[[package]]
461−+name = "unicode-width"
462−+version = "0.1.8"
463−+source = "registry+https://github.com/rust-lang/crates.io-index"
464−+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
465−+
466−+[[package]]
467−+name = "vec_map"
468−+version = "0.8.2"
469−+source = "registry+https://github.com/rust-lang/crates.io-index"
470−+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
471−+
472−+[[package]]
473−+name = "version_check"
474−+version = "0.9.2"
475−+source = "registry+https://github.com/rust-lang/crates.io-index"
476−+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
477−+
478−+[[package]]
479−+name = "wasi"
480−+version = "0.9.0+wasi-snapshot-preview1"
481−+source = "registry+https://github.com/rust-lang/crates.io-index"
482−+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
483−+
484−+[[package]]
485−+name = "wild"
486−+version = "2.0.4"
487−+source = "registry+https://github.com/rust-lang/crates.io-index"
488−+checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020"
489−+dependencies = [
490−+ "glob",
491−+]
492−+
493−+[[package]]
494−+name = "winapi"
495−+version = "0.3.9"
496−+source = "registry+https://github.com/rust-lang/crates.io-index"
497−+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
498−+dependencies = [
499−+ "winapi-i686-pc-windows-gnu",
500−+ "winapi-x86_64-pc-windows-gnu",
501−+]
502−+
503−+[[package]]
504−+name = "winapi-i686-pc-windows-gnu"
505−+version = "0.4.0"
506−+source = "registry+https://github.com/rust-lang/crates.io-index"
507−+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
508−+
509−+[[package]]
510−+name = "winapi-x86_64-pc-windows-gnu"
511−+version = "0.4.0"
512−+source = "registry+https://github.com/rust-lang/crates.io-index"
513−+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
pkgs/tools/security/b3sum/default.nix+6−12
@@ -1,21 +1,15 @@
1−{ lib, fetchFromGitHub, rustPlatform }:
1+{ lib, fetchCrate, rustPlatform }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "b3sum";
5− version = "0.3.7";
5+ version = "0.3.8";
66
7− src = fetchFromGitHub {
8− owner = "BLAKE3-team";
9− repo = "BLAKE3";
10− rev = version;
11− sha256 = "0r3nj7jbrpb2gkkfa9h6nv6blrbv6dlrhxg131qnh340q1ysh0x7";
7+ src = fetchCrate {
8+ inherit version pname;
9+ sha256 = "1a42kwbl886yymm3v7h6y957x5f4yi9j40jy4szg9k0iy8bsdfmh";
1210 };
1311
14− sourceRoot = "source/b3sum";
15−
16− cargoSha256 = "18l6j756s6qfmiy3z2cai7i62wskf04xi7y4dlcv4aiv4sv3nx9r";
17−
18− cargoPatches = [ ./cargo-lock.patch ];
12+ cargoSha256 = "0v7ric12agicppg5ax5q0vwbslw7kmxpinafvdjj5sc2ysinw1zm";
1913
2014 meta = {
2115 description = "BLAKE3 cryptographic hash function";
pkgs/tools/security/b3sum/update-cargo-lock.shdeleted−19
@@ -1,19 +0,0 @@
1−#!/bin/sh
2−
3−# This updates cargo-lock.patch for the b3sum version listed in default.nix.
4−
5−set -eu -o verbose
6−
7−here=$PWD
8−version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
9−checkout=$(mktemp -d)
10−git clone -b "$version" --depth=1 https://github.com/BLAKE3-team/BLAKE3 "$checkout"
11−cd "$checkout"
12−
13−(cd b3sum && cargo generate-lockfile)
14−mv b3sum/Cargo.lock ./
15−git add -f Cargo.lock
16−git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
17−
18−cd "$here"
19−rm -rf "$checkout"