Cargo.nix, and solving conflicts
[?]
Nov 26, 2020, 4:00 PM
H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXACDependencies
- [2]
OCBM7IFENew release: pijul-1.0.0-alpha.8 - [3]
Q7CAYX5NFixing Windows compilation - [4]
UDHP4ZVBFixing SSH asynchronicity issues - [5]
I52XSRUHMassive cleanup, and simplification - [6]
G734WNM6flake.nix: use crate2nix - [7]
XWETQ4DEUpgrading versions - [8]
RR65HCKOThrussh versions - [9]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [10]
RPZK3JQAFixing a conflict - [11]
B5Z4IMEUGenerating Cargo.nix for pijul 1.0.0-alpha.6 - [12]
3WIQYEISFixing conflicts in Cargo.lock
Change contents
- resurrect zombie in "pijul/Cargo.toml" at line 60
thrussh-keys = "0.18.8" - edit in Cargo.nix at line 290[3.9638]→[3.9638:9647](∅→∅),[3.9647]→[3.74455:74485](∅→∅),[3.74485]→[3.9670:10072](∅→∅),[3.9670]→[3.9670:10072](∅→∅)
};"base64 0.12.3" = rec {crateName = "base64";version = "0.12.3";edition = "2018";sha256 = "1zq33had71xh48n17g4kqs96szhx3yh7qibzwi4fk217n3vz0h9l";authors = ["Alice Maz <alice@alicemaz.com>""Marshall Pierce <marshall@mpierce.org>"];features = {"default" = [ "std" ];};resolvedDefaultFeatures = [ "default" "std" ]; - replacement in Cargo.nix at line 291
"base64 0.13.0" = rec {"base64" = rec { - edit in Cargo.nix at line 990
];};"const_fn" = rec {crateName = "const_fn";version = "0.4.3";edition = "2018";sha256 = "1axgb6p2b0mdazi000vf0hd7hky690s052bwnizz3klx09p86y64";procMacro = true;authors = ["Taiki Endo <te316e89@gmail.com>" - edit in Cargo.nix at line 1058[3.31074]→[3.31074:31083](∅→∅),[3.31083]→[3.75876:75914](∅→∅),[3.75914]→[3.31115:31463](∅→∅),[3.31115]→[3.31115:31463](∅→∅),[3.31463]→[3.75915:76365](∅→∅)
};"crossbeam-utils 0.7.2" = rec {crateName = "crossbeam-utils";version = "0.7.2";edition = "2015";sha256 = "1a31wbrda1320gj2a6az1lin2d34xfc3xf88da4c17qy5lxcgiy3";authors = ["The Crossbeam Project Developers"];dependencies = [{name = "cfg-if";packageId = "cfg-if 0.1.10";}{name = "lazy_static";packageId = "lazy_static";optional = true;}];buildDependencies = [{name = "autocfg";packageId = "autocfg";}];features = {"default" = [ "std" ];"std" = [ "lazy_static" ];};resolvedDefaultFeatures = [ "default" "lazy_static" "std" ]; - replacement in Cargo.nix at line 1059
"crossbeam-utils 0.8.0" = rec {"crossbeam-utils" = rec { - replacement in Cargo.nix at line 1061
version = "0.8.0";version = "0.8.1"; - replacement in Cargo.nix at line 1063
sha256 = "199ywwmkg60kqavhw8rhy9wybsfjr9p5czinhq56jprmk06m94gc";sha256 = "13fvrqlap7bgvlnpqr5gjcxdhx1jv99pkfg5xdlq5xcy30g6vn82"; - edit in Cargo.nix at line 1071
}{name = "const_fn";packageId = "const_fn"; - replacement in Cargo.nix at line 2659
packageId = "crossbeam-utils 0.8.0";packageId = "crossbeam-utils"; - replacement in Cargo.nix at line 2962
version = "1.0.0-alpha.4";version = "1.0.0-alpha.6"; - replacement in Cargo.nix at line 4025
version = "1.0.0-alpha.6";version = "1.0.0-alpha.8"; - replacement in Cargo.nix at line 4737
packageId = "base64 0.13.0";packageId = "base64"; - replacement in Cargo.nix at line 4949
version = "0.8.2";version = "0.8.3"; - replacement in Cargo.nix at line 4951
sha256 = "069syiy3ncg9yai58p3dalwvgpr1aqisqls0x1sk54vm0wjn3awx";sha256 = "1yvqkv04fqk3cbvyasibr4bqbxa6mij8jdvibakwlcsbjh6q462b"; - replacement in Cargo.nix at line 4959
packageId = "base64 0.12.3";packageId = "base64"; - replacement in Cargo.nix at line 4971
packageId = "crossbeam-utils 0.7.2";packageId = "crossbeam-utils"; - replacement in Cargo.nix at line 5409
version = "1.0.50";version = "1.0.51"; - replacement in Cargo.nix at line 5411
sha256 = "1xph2b437ac56gn85ndlc074mmr1v89cwdny3cg8anlwf5w42fs4";sha256 = "08wjvygyi3pn3fkmbh5wys6i7m957sahkvarsc22incp74ck8krv"; - replacement in Cargo.nix at line 5644
version = "0.29.9";version = "0.29.10"; - replacement in Cargo.nix at line 5646
sha256 = "13i1cn398yx37frgp69ki9miq89gchj5l1vbdiinqak1ar93b2ss";sha256 = "129djsmp347gclcnkvpgnnj09lanqa9ynr683v8hj0ylsjqbfji0"; - replacement in Cargo.nix at line 6125
version = "0.1.21";version = "0.1.22"; - replacement in Cargo.nix at line 6127
sha256 = "09wzhxybimp4h6xkc0kcgryd70lvnmyf2q7yaf962crpvd87i65h";sha256 = "1qzg7rcfby8f2nn1ln3gk6fjc80q0bg8fw5k95zc1020vin04iwz"; - replacement in Cargo.nix at line 6135
packageId = "cfg-if 0.1.10";packageId = "cfg-if 1.0.0"; - replacement in Cargo.nix at line 6144
packageId = "pin-project-lite 0.1.11";packageId = "pin-project-lite 0.2.0"; - replacement in Cargo.nix at line 6301
version = "1.7.0";version = "1.7.1"; - replacement in Cargo.nix at line 6303
sha256 = "1bjslc64p8mq8hdrg80sprnprjq7li5b865wv94zz47jcshid1yv";sha256 = "15n736z0pbj30pj44jb9s9rjavzrmx8v8pzdgsl5yfmfwrxjw3dv"; - edit in Cargo.lock at line 84
[[package]]name = "base64"version = "0.12.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - edit in Cargo.lock at line 319
[[package]]name = "const_fn"version = "0.4.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" - edit in Cargo.lock at line 349
][[package]]name = "crossbeam-utils"version = "0.7.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"dependencies = ["autocfg","cfg-if 0.1.10","lazy_static", - replacement in Cargo.lock at line 353
version = "0.8.0"version = "0.8.1" - replacement in Cargo.lock at line 355
checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" - edit in Cargo.lock at line 359
"const_fn", - replacement in Cargo.lock at line 929
"crossbeam-utils 0.8.0","crossbeam-utils", - replacement in Cargo.lock at line 1700
"base64 0.13.0","base64", - replacement in Cargo.lock at line 1742
version = "0.8.2"version = "0.8.3" - replacement in Cargo.lock at line 1744
checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" - replacement in Cargo.lock at line 1746
"base64 0.12.3","base64", - replacement in Cargo.lock at line 1749
"crossbeam-utils 0.7.2","crossbeam-utils", - replacement in Cargo.lock at line 1931
version = "1.0.50"version = "1.0.51" - replacement in Cargo.lock at line 1933
checksum = "443b4178719c5a851e1bde36ce12da21d74a0e60b4d982ec3385a933c812f0f6"checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223" - resurrect zombie in "Cargo.lock" at line 2034
source = "registry+https://github.com/rust-lang/crates.io-index" - resurrect zombie in "Cargo.lock" at line 2036[3.494]→[3.1078400:1078455](∅→∅),[3.1626]→[3.1078400:1078455](∅→∅),[3.12913]→[3.1078400:1078455](∅→∅),[2.296]→[3.1078400:1078455](∅→∅),[3.1078400]→[3.1078400:1078455](∅→∅),[3.494]→[3.1078400:1078455](∅→∅)
dependencies = ["anyhow","bitflags","byteorder", - resurrect zombie in "Cargo.lock" at line 2041[3.1647]→[3.1078469:1078612](∅→∅),[3.2276]→[3.1078469:1078612](∅→∅),[3.1078469]→[3.1078469:1078612](∅→∅),[3.1078469]→[3.1078469:1078612](∅→∅)
"flate2","futures","log","openssl","thiserror","thrussh-keys","thrussh-libsodium","tokio",][[package]]name = "thrussh-keys" - resurrect zombie in "Cargo.lock" at line 2054[3.1667]→[3.1078631:1078696](∅→∅),[3.12933]→[3.1078631:1078696](∅→∅),[3.1078631]→[3.1078631:1078696](∅→∅),[3.1078631]→[3.1078631:1078696](∅→∅)
source = "registry+https://github.com/rust-lang/crates.io-index" - resurrect zombie in "Cargo.lock" at line 2056[3.1746]→[3.1078774:1078828](∅→∅),[3.13012]→[3.1078774:1078828](∅→∅),[3.1078774]→[3.1078774:1078828](∅→∅),[3.1078774]→[3.1078774:1078828](∅→∅)
dependencies = ["anyhow","bit-vec","byteorder", - resurrect zombie in "Cargo.lock" at line 2061[3.1767]→[3.1078842:1079608](∅→∅),[3.2291]→[3.1078842:1079608](∅→∅),[3.1078842]→[3.1078842:1079608](∅→∅),[3.1078842]→[3.1078842:1079608](∅→∅)
"data-encoding","dirs","futures","log","num-bigint","num-integer","openssl","serde","serde_derive","thiserror","thrussh-libsodium","tokio","yasna",][[package]]name = "thrussh-libsodium"version = "0.2.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "cfe89c70d27b1cb92e13bc8af63493e890d0de46dae4df0e28233f62b4ed9500"dependencies = ["lazy_static","libc","libsodium-sys","pkg-config","vcpkg",][[package]]name = "time"version = "0.1.44"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"dependencies = ["libc","wasi 0.10.0+wasi-snapshot-preview1","winapi 0.3.9",][[package]]name = "tinyvec" - resurrect zombie in "Cargo.lock" at line 2103[3.2321]→[3.1079626:1079691](∅→∅),[3.1079626]→[3.1079626:1079691](∅→∅),[3.1079626]→[3.1079626:1079691](∅→∅)
source = "registry+https://github.com/rust-lang/crates.io-index" - resurrect zombie in "Cargo.lock" at line 2105[3.2400]→[3.1079769:1080326](∅→∅),[3.1079769]→[3.1079769:1080326](∅→∅),[3.1079769]→[3.1079769:1080326](∅→∅)
dependencies = ["tinyvec_macros",][[package]]name = "tinyvec_macros"version = "0.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"[[package]]name = "tokio"version = "0.2.23"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"dependencies = ["bytes","fnv","futures-core","iovec","lazy_static","libc","memchr","mio","mio-uds","num_cpus", - resurrect zombie in "Cargo.lock" at line 2132[3.2429]→[3.1080347:1081124](∅→∅),[3.1080347]→[3.1080347:1081124](∅→∅),[3.1080347]→[3.1080347:1081124](∅→∅)
"slab","tokio-macros",][[package]]name = "tokio-macros"version = "0.2.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"dependencies = ["proc-macro2","quote","syn",][[package]]name = "tokio-tls"version = "0.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"dependencies = ["native-tls","tokio",][[package]]name = "tokio-util"version = "0.3.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"dependencies = ["bytes","futures-core","futures-sink","log", - resurrect zombie in "Cargo.lock" at line 2168[3.2458]→[3.1081145:1081601](∅→∅),[3.1081145]→[3.1081145:1081601](∅→∅),[3.1081145]→[3.1081145:1081601](∅→∅)
"tokio",][[package]]name = "toml"version = "0.5.7"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"dependencies = ["serde",][[package]]name = "tower-service"version = "0.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"[[package]]name = "tracing" - replacement in Cargo.lock at line 2188
version = "0.1.21"version = "0.1.22" - replacement in Cargo.lock at line 2190
checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" - replacement in Cargo.lock at line 2192
"cfg-if 0.1.10","cfg-if 1.0.0", - edit in Cargo.lock at line 2194
"pin-project-lite 0.1.11", - resurrect zombie in "Cargo.lock" at line 2194[3.2487]→[3.1081827:1083214](∅→∅),[3.1081827]→[3.1081827:1083214](∅→∅),[3.1081827]→[3.1081827:1083214](∅→∅)
"tracing-core",][[package]]name = "tracing-core"version = "0.1.17"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"dependencies = ["lazy_static",][[package]]name = "tracing-futures"version = "0.2.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"dependencies = ["pin-project 0.4.27","tracing",][[package]]name = "try-lock"version = "0.2.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"[[package]]name = "typenum"version = "1.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"[[package]]name = "unicase"version = "2.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"dependencies = ["version_check",][[package]]name = "unicode-bidi"version = "0.3.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"dependencies = ["matches",][[package]]name = "unicode-normalization" - edit in Cargo.lock at line 2194
"pin-project-lite 0.2.0", - resurrect zombie in "Cargo.lock" at line 2250[3.1787]→[3.1083233:1083298](∅→∅),[3.1083233]→[3.1083233:1083298](∅→∅),[3.1083233]→[3.1083233:1083298](∅→∅)
source = "registry+https://github.com/rust-lang/crates.io-index" - resurrect zombie in "Cargo.lock" at line 2252[3.1866]→[3.1083376:1083450](∅→∅),[3.1083376]→[3.1083376:1083450](∅→∅),[3.1083376]→[3.1083376:1083450](∅→∅)
dependencies = ["tinyvec",][[package]]name = "unicode-segmentation" - replacement in Cargo.lock at line 2258
version = "1.7.0"version = "1.7.1" - replacement in Cargo.lock at line 2260
checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae"checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - resurrect zombie in "Cargo.lock" at line 2439[3.3087]→[3.1087648:1090745](∅→∅),[3.1087648]→[3.1087648:1090745](∅→∅),[3.1087648]→[3.1087648:1090745](∅→∅)
name = "web-sys"version = "0.3.45"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"dependencies = ["js-sys","wasm-bindgen",][[package]]name = "which"version = "3.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"dependencies = ["libc",][[package]]name = "whoami"version = "0.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504"[[package]]name = "winapi"version = "0.2.8"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"[[package]]name = "winapi"version = "0.3.9"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"dependencies = ["winapi-i686-pc-windows-gnu","winapi-x86_64-pc-windows-gnu",][[package]]name = "winapi-build"version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"[[package]]name = "winapi-i686-pc-windows-gnu"version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"[[package]]name = "winapi-util"version = "0.1.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"dependencies = ["winapi 0.3.9",][[package]]name = "winapi-x86_64-pc-windows-gnu"version = "0.4.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"[[package]]name = "winreg"version = "0.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"dependencies = ["winapi 0.3.9",][[package]]name = "ws2_32-sys"version = "0.2.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"dependencies = ["winapi 0.2.8","winapi-build",][[package]]name = "xattr"version = "0.2.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"dependencies = ["libc",][[package]]name = "yasna"version = "0.3.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb"dependencies = ["bit-vec","num-bigint",][[package]]name = "zeroize"version = "1.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a"[[package]]name = "zstd-seekable" - resurrect zombie in "Cargo.lock" at line 2553[3.3106]→[3.1090763:1090828](∅→∅),[3.1090763]→[3.1090763:1090828](∅→∅),[3.1090763]→[3.1090763:1090828](∅→∅)
source = "registry+https://github.com/rust-lang/crates.io-index" - resurrect zombie in "Cargo.lock" at line 2555[3.3185]→[3.1090906:1091003](∅→∅),[3.1090906]→[3.1090906:1091003](∅→∅),[3.1090906]→[3.1090906:1091003](∅→∅)
dependencies = ["anyhow","bindgen","cc","cmake","libc","thiserror","threadpool",]