maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/narinfo2parquet): bump dependencies

Browse source 
Get rid of the RUSTSEC warnings.

Also upgrade tokio to drop the Sized requirement, similar to cl/11608.

Change-Id: Idc6fece23c79eb30fd1dfc5fe64fa2e4c08cd412
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11624
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-05-10 17:22:01 +03:00 • committed by clbot
parent d9c2a1994c
commit bdf4df1ac7
2 changed files with 135 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tvix/tools/narinfo2parquet/Cargo.lock generated
View file

@ -486,6 +486,17 @@ version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "enum-primitive-derive"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba7795da175654fe16979af73f81f26a8ea27638d8d9823d317016888a63dc4c"
dependencies = [
"num-traits",
"quote",
"syn 2.0.39",
]
[[package]] [[package]]
name = "enum_dispatch" name = "enum_dispatch"
version = "0.3.12" version = "0.3.12"
@ -878,9 +889,9 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.9" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [ dependencies = [
"libc", "libc",
"wasi", "wasi",
@ -930,12 +941,16 @@ dependencies = [
"data-encoding", "data-encoding",
"ed25519", "ed25519",
"ed25519-dalek", "ed25519-dalek",
"enum-primitive-derive",
"glob", "glob",
"nom", "nom",
"num-traits",
"pin-project-lite",
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
"thiserror", "thiserror",
"tokio",
] ]
[[package]] [[package]]
@ -968,9 +983,9 @@ dependencies = [
[[package]] [[package]]
name = "num-traits" name = "num-traits"
version = "0.2.17" version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"libm", "libm",
@ -1805,9 +1820,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.33.0" version = "1.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -1816,9 +1831,21 @@ dependencies = [
"num_cpus", "num_cpus",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio-macros",
"windows-sys", "windows-sys",
] ]
[[package]]
name = "tokio-macros"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.39",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.10" version = "0.7.10"
@ -2091,18 +2118,18 @@ checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.7.25" version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.7.25" version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

115
tvix/tools/narinfo2parquet/Cargo.nix
View file

@ -1,4 +1,4 @@
# This file was @generated by crate2nix 0.13.0 with the command: # This file was @generated by crate2nix 0.14.0 with the command:
# "generate" "--all-features" # "generate" "--all-features"
# See https://github.com/kolloch/crate2nix for more info. # See https://github.com/kolloch/crate2nix for more info.
@ -1429,6 +1429,32 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" "use_std" ]; resolvedDefaultFeatures = [ "default" "use_std" ];
}; };
"enum-primitive-derive" = rec {
crateName = "enum-primitive-derive";
version = "0.3.0";
edition = "2018";
sha256 = "0k6wcf58h5kh64yq5nfq71va53kaya0kzxwsjwbgwm2n2zd9axxs";
procMacro = true;
authors = [
"Doug Goldstein <cardoe@cardoe.com>"
];
dependencies = [
{
name = "num-traits";
packageId = "num-traits";
usesDefaultFeatures = false;
}
{
name = "quote";
packageId = "quote";
}
{
name = "syn";
packageId = "syn 2.0.39";
}
];
};
"enum_dispatch" = rec { "enum_dispatch" = rec {
crateName = "enum_dispatch"; crateName = "enum_dispatch";
version = "0.3.12"; version = "0.3.12";
@ -2511,9 +2537,9 @@ rec {
}; };
"mio" = rec { "mio" = rec {
crateName = "mio"; crateName = "mio";
version = "0.8.9"; version = "0.8.11";
edition = "2018"; edition = "2018";
sha256 = "1l23hg513c23nhcdzvk25caaj28mic6qgqadbn8axgj6bqf2ikix"; sha256 = "034byyl0ardml5yliy1hmvx8arkmn9rv479pid794sm07ia519m4";
authors = [ authors = [
"Carl Lerche <me@carllerche.com>" "Carl Lerche <me@carllerche.com>"
"Thomas de Zeeuw <thomasdezeeuw@gmail.com>" "Thomas de Zeeuw <thomasdezeeuw@gmail.com>"
@ -2688,6 +2714,10 @@ rec {
name = "ed25519-dalek"; name = "ed25519-dalek";
packageId = "ed25519-dalek"; packageId = "ed25519-dalek";
} }
{
name = "enum-primitive-derive";
packageId = "enum-primitive-derive";
}
{ {
name = "glob"; name = "glob";
packageId = "glob"; packageId = "glob";
@ -2696,6 +2726,15 @@ rec {
name = "nom"; name = "nom";
packageId = "nom"; packageId = "nom";
} }
{
name = "num-traits";
packageId = "num-traits";
}
{
name = "pin-project-lite";
packageId = "pin-project-lite";
optional = true;
}
{ {
name = "serde"; name = "serde";
packageId = "serde"; packageId = "serde";
@ -2713,6 +2752,12 @@ rec {
name = "thiserror"; name = "thiserror";
packageId = "thiserror"; packageId = "thiserror";
} }
{
name = "tokio";
packageId = "tokio";
optional = true;
features = [ "io-util" "macros" ];
}
]; ];
devDependencies = [ devDependencies = [
{ {
@ -2721,9 +2766,13 @@ rec {
} }
]; ];
features = { features = {
"async" = [ "futures-util" ]; "async" = [ "tokio" ];
"futures-util" = [ "dep:futures-util" ]; "default" = [ "async" "wire" ];
"pin-project-lite" = [ "dep:pin-project-lite" ];
"tokio" = [ "dep:tokio" ];
"wire" = [ "tokio" "pin-project-lite" ];
}; };
resolvedDefaultFeatures = [ "async" "default" "pin-project-lite" "tokio" "wire" ];
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
@ -2792,9 +2841,9 @@ rec {
}; };
"num-traits" = rec { "num-traits" = rec {
crateName = "num-traits"; crateName = "num-traits";
version = "0.2.17"; version = "0.2.19";
edition = "2018"; edition = "2021";
sha256 = "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr"; sha256 = "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787";
authors = [ authors = [
"The Rust Project Developers" "The Rust Project Developers"
]; ];
@ -6026,9 +6075,9 @@ rec {
}; };
"tokio" = rec { "tokio" = rec {
crateName = "tokio"; crateName = "tokio";
version = "1.33.0"; version = "1.37.0";
edition = "2021"; edition = "2021";
sha256 = "0lynj8nfqziviw72qns9mjlhmnm66bsc5bivy5g5x6gp7q720f2g"; sha256 = "11v7qhvpwsf976frqgrjl1jy308bdkxq195gb38cypx7xkzypnqs";
authors = [ authors = [
"Tokio Contributors <team@tokio.rs>" "Tokio Contributors <team@tokio.rs>"
]; ];
@ -6071,6 +6120,11 @@ rec {
target = { target, features }: (!(builtins.elem "wasm" target."family")); target = { target, features }: (!(builtins.elem "wasm" target."family"));
features = [ "all" ]; features = [ "all" ];
} }
{
name = "tokio-macros";
packageId = "tokio-macros";
optional = true;
}
{ {
name = "windows-sys"; name = "windows-sys";
packageId = "windows-sys"; packageId = "windows-sys";
@ -6116,7 +6170,33 @@ rec {
"tracing" = [ "dep:tracing" ]; "tracing" = [ "dep:tracing" ];
"windows-sys" = [ "dep:windows-sys" ]; "windows-sys" = [ "dep:windows-sys" ];
}; };
resolvedDefaultFeatures = [ "bytes" "default" "io-util" "libc" "mio" "net" "num_cpus" "rt" "rt-multi-thread" "socket2" "sync" "time" "windows-sys" ]; resolvedDefaultFeatures = [ "bytes" "default" "io-util" "libc" "macros" "mio" "net" "num_cpus" "rt" "rt-multi-thread" "socket2" "sync" "time" "tokio-macros" "windows-sys" ];
};
"tokio-macros" = rec {
crateName = "tokio-macros";
version = "2.2.0";
edition = "2021";
sha256 = "0fwjy4vdx1h9pi4g2nml72wi0fr27b5m954p13ji9anyy8l1x2jv";
procMacro = true;
authors = [
"Tokio Contributors <team@tokio.rs>"
];
dependencies = [
{
name = "proc-macro2";
packageId = "proc-macro2";
}
{
name = "quote";
packageId = "quote";
}
{
name = "syn";
packageId = "syn 2.0.39";
features = [ "full" ];
}
];
}; };
"tokio-util" = rec { "tokio-util" = rec {
crateName = "tokio-util"; crateName = "tokio-util";
@ -7673,9 +7753,9 @@ rec {
}; };
"zerocopy" = rec { "zerocopy" = rec {
crateName = "zerocopy"; crateName = "zerocopy";
version = "0.7.25"; version = "0.7.34";
edition = "2018"; edition = "2018";
sha256 = "0mv5w4fq1kcpw1ydcb5cvr8zdms5pqy0r60g04ayzpqfgjk6klwc"; sha256 = "11xhrwixm78m6ca1jdxf584wdwvpgg7q00vg21fhwl0psvyf71xf";
authors = [ authors = [
"Joshua Liebow-Feeser <joshlf@google.com>" "Joshua Liebow-Feeser <joshlf@google.com>"
]; ];
@ -7709,9 +7789,9 @@ rec {
}; };
"zerocopy-derive" = rec { "zerocopy-derive" = rec {
crateName = "zerocopy-derive"; crateName = "zerocopy-derive";
version = "0.7.25"; version = "0.7.34";
edition = "2018"; edition = "2018";
sha256 = "0svxr32pp4lav1vjar127g2r09gpiajxn0yv1k66r8hrlayl1wf2"; sha256 = "0fqvglw01w3hp7xj9gdk1800x9j7v58s9w8ijiyiz2a7krb39s8m";
procMacro = true; procMacro = true;
authors = [ authors = [
"Joshua Liebow-Feeser <joshlf@google.com>" "Joshua Liebow-Feeser <joshlf@google.com>"
@ -7969,8 +8049,9 @@ rec {
# because we compiled those test binaries in the former and not the latter. # because we compiled those test binaries in the former and not the latter.
# So all paths will expect source tree to be there and not in the build top directly. # So all paths will expect source tree to be there and not in the build top directly.
# For example: $NIX_BUILD_TOP := /build in general, if you ask yourself. # For example: $NIX_BUILD_TOP := /build in general, if you ask yourself.
# TODO(raitobezarius): I believe there could be more edge cases if `crate.sourceRoot` # NOTE: There could be edge cases if `crate.sourceRoot` does exist but
# do exist but it's very hard to reason about them, so let's wait until the first bug report. # it's very hard to reason about them.
# Open a bug if you run into this!
mkdir -p source/ mkdir -p source/
cd source/ cd source/