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

chore(tvix/build): Bump oci-spec dependency

Browse source 
Our oci-spec was a bit oudated and there were some renamings in one of
the release, which made building tvix-build fail if it's a dependency.
I encountered this issue while working on tvix-eval-jobs.

Change-Id: I6d982965176b83170a07445e351d3f5e5679ed2e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12586
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: BuildkiteCI
This commit is contained in:
Ilan Joselevich 2024-10-10 19:50:19 +02:00 • committed by clbot
parent 52bb3c6d02
commit b4ccaac7ad
4 changed files with 149 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

109
tvix/Cargo.lock generated
View file

@ -645,7 +645,7 @@ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
"clap_lex", "clap_lex",
"strsim 0.11.1", "strsim",
] ]
[[package]] [[package]]
@ -889,70 +889,35 @@ dependencies = [
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.14.4" version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [ dependencies = [
"darling_core 0.14.4", "darling_core",
"darling_macro 0.14.4", "darling_macro",
]
[[package]]
name = "darling"
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
dependencies = [
"darling_core 0.20.8",
"darling_macro 0.20.8",
] ]
[[package]] [[package]]
name = "darling_core" name = "darling_core"
version = "0.14.4" version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim 0.10.0", "strsim",
"syn 1.0.109",
]
[[package]]
name = "darling_core"
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.10.0",
"syn 2.0.76", "syn 2.0.76",
] ]
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.14.4" version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [ dependencies = [
"darling_core 0.14.4", "darling_core",
"quote",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
"darling_core 0.20.8",
"quote", "quote",
"syn 2.0.76", "syn 2.0.76",
] ]
@ -985,33 +950,33 @@ dependencies = [
[[package]] [[package]]
name = "derive_builder" name = "derive_builder"
version = "0.12.0" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
dependencies = [ dependencies = [
"derive_builder_macro", "derive_builder_macro",
] ]
[[package]] [[package]]
name = "derive_builder_core" name = "derive_builder_core"
version = "0.12.0" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
dependencies = [ dependencies = [
"darling 0.14.4", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn 2.0.76",
] ]
[[package]] [[package]]
name = "derive_builder_macro" name = "derive_builder_macro"
version = "0.12.0" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [ dependencies = [
"derive_builder_core", "derive_builder_core",
"syn 1.0.109", "syn 2.0.76",
] ]
[[package]] [[package]]
@ -2507,14 +2472,17 @@ dependencies = [
[[package]] [[package]]
name = "oci-spec" name = "oci-spec"
version = "0.6.4" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8384f8eff13954bafafba991f1910779020456f9694de25e81a13da5b7de6309" checksum = "5cee185ce7cf1cce45e194e34cd87c0bad7ff0aa2e8917009a2da4f7b31fb363"
dependencies = [ dependencies = [
"derive_builder", "derive_builder",
"getset", "getset",
"regex",
"serde", "serde",
"serde_json", "serde_json",
"strum",
"strum_macros",
"thiserror", "thiserror",
] ]
@ -3714,7 +3682,7 @@ version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
dependencies = [ dependencies = [
"darling 0.20.8", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.76", "syn 2.0.76",
@ -3859,12 +3827,6 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.11.1" version = "0.11.1"
@ -3894,6 +3856,25 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "strum"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
[[package]]
name = "strum_macros"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.76",
]
[[package]] [[package]]
name = "subtle" name = "subtle"
version = "2.5.0" version = "2.5.0"

236
tvix/Cargo.nix
View file

@ -2264,7 +2264,7 @@ rec {
} }
{ {
name = "strsim"; name = "strsim";
packageId = "strsim 0.11.1"; packageId = "strsim";
optional = true; optional = true;
} }
]; ];
@ -2943,22 +2943,22 @@ rec {
]; ];
}; };
"darling 0.14.4" = rec { "darling" = rec {
crateName = "darling"; crateName = "darling";
version = "0.14.4"; version = "0.20.10";
edition = "2018"; edition = "2021";
sha256 = "0l1qrn805bsxa0iy7x8bmdwr8c10hlw0yiqs8ckv7lbz86rhqxbv"; sha256 = "1299h2z88qn71mizhh05j26yr3ik0wnqmw11ijds89l8i9nbhqvg";
authors = [ authors = [
"Ted Driggs <ted.driggs@outlook.com>" "Ted Driggs <ted.driggs@outlook.com>"
]; ];
dependencies = [ dependencies = [
{ {
name = "darling_core"; name = "darling_core";
packageId = "darling_core 0.14.4"; packageId = "darling_core";
} }
{ {
name = "darling_macro"; name = "darling_macro";
packageId = "darling_macro 0.14.4"; packageId = "darling_macro";
} }
]; ];
features = { features = {
@ -2968,36 +2968,11 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" "suggestions" ]; resolvedDefaultFeatures = [ "default" "suggestions" ];
}; };
"darling 0.20.8" = rec { "darling_core" = rec {
crateName = "darling";
version = "0.20.8";
edition = "2018";
sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl";
authors = [
"Ted Driggs <ted.driggs@outlook.com>"
];
dependencies = [
{
name = "darling_core";
packageId = "darling_core 0.20.8";
}
{
name = "darling_macro";
packageId = "darling_macro 0.20.8";
}
];
features = {
"default" = [ "suggestions" ];
"diagnostics" = [ "darling_core/diagnostics" ];
"suggestions" = [ "darling_core/suggestions" ];
};
resolvedDefaultFeatures = [ "default" "suggestions" ];
};
"darling_core 0.14.4" = rec {
crateName = "darling_core"; crateName = "darling_core";
version = "0.14.4"; version = "0.20.10";
edition = "2018"; edition = "2021";
sha256 = "1w4b2ndxmkwghwq84yphk8x15jnpivm08w596g12ry5pwsk1r70h"; sha256 = "1rgr9nci61ahnim93yh3xy6fkfayh7sk4447hahawah3m1hkh4wm";
authors = [ authors = [
"Ted Driggs <ted.driggs@outlook.com>" "Ted Driggs <ted.driggs@outlook.com>"
]; ];
@ -3020,49 +2995,7 @@ rec {
} }
{ {
name = "strsim"; name = "strsim";
packageId = "strsim 0.10.0"; packageId = "strsim";
optional = true;
}
{
name = "syn";
packageId = "syn 1.0.109";
features = [ "full" "extra-traits" ];
}
];
features = {
"strsim" = [ "dep:strsim" ];
"suggestions" = [ "strsim" ];
};
resolvedDefaultFeatures = [ "strsim" "suggestions" ];
};
"darling_core 0.20.8" = rec {
crateName = "darling_core";
version = "0.20.8";
edition = "2018";
sha256 = "03x7s149p06xfwcq0lgkk4yxh6jf7jckny18nzp1yyk87b1g2b4w";
authors = [
"Ted Driggs <ted.driggs@outlook.com>"
];
dependencies = [
{
name = "fnv";
packageId = "fnv";
}
{
name = "ident_case";
packageId = "ident_case";
}
{
name = "proc-macro2";
packageId = "proc-macro2";
}
{
name = "quote";
packageId = "quote";
}
{
name = "strsim";
packageId = "strsim 0.10.0";
optional = true; optional = true;
} }
{ {
@ -3077,11 +3010,11 @@ rec {
}; };
resolvedDefaultFeatures = [ "strsim" "suggestions" ]; resolvedDefaultFeatures = [ "strsim" "suggestions" ];
}; };
"darling_macro 0.14.4" = rec { "darling_macro" = rec {
crateName = "darling_macro"; crateName = "darling_macro";
version = "0.14.4"; version = "0.20.10";
edition = "2018"; edition = "2021";
sha256 = "13mlyd5w275c815k0ijf6g4c446hs8b3m2h4an5isqgpr7dv9am4"; sha256 = "01kq3ibbn47czijj39h3vxyw0c2ksd0jvc097smcrk7n2jjs4dnk";
procMacro = true; procMacro = true;
authors = [ authors = [
"Ted Driggs <ted.driggs@outlook.com>" "Ted Driggs <ted.driggs@outlook.com>"
@ -3089,32 +3022,7 @@ rec {
dependencies = [ dependencies = [
{ {
name = "darling_core"; name = "darling_core";
packageId = "darling_core 0.14.4"; packageId = "darling_core";
}
{
name = "quote";
packageId = "quote";
}
{
name = "syn";
packageId = "syn 1.0.109";
}
];
};
"darling_macro 0.20.8" = rec {
crateName = "darling_macro";
version = "0.20.8";
edition = "2018";
sha256 = "0gwkz0cjfy3fgcc1zmm7azzhj5qpja34s0cklcria4l38sjyss56";
procMacro = true;
authors = [
"Ted Driggs <ted.driggs@outlook.com>"
];
dependencies = [
{
name = "darling_core";
packageId = "darling_core 0.20.8";
} }
{ {
name = "quote"; name = "quote";
@ -3212,9 +3120,9 @@ rec {
}; };
"derive_builder" = rec { "derive_builder" = rec {
crateName = "derive_builder"; crateName = "derive_builder";
version = "0.12.0"; version = "0.20.2";
edition = "2015"; edition = "2018";
sha256 = "1y4p569zcvpmly5s5hmjp9h83drxvdp6kj6bb61h225mhj3pfrwd"; sha256 = "0is9z7v3kznziqsxa5jqji3ja6ay9wzravppzhcaczwbx84znzah";
authors = [ authors = [
"Colin Kiegel <kiegel@gmx.de>" "Colin Kiegel <kiegel@gmx.de>"
"Pascal Hertleif <killercup@gmail.com>" "Pascal Hertleif <killercup@gmail.com>"
@ -3228,16 +3136,18 @@ rec {
} }
]; ];
features = { features = {
"alloc" = [ "derive_builder_macro/alloc" ];
"clippy" = [ "derive_builder_macro/clippy" ]; "clippy" = [ "derive_builder_macro/clippy" ];
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "derive_builder_macro/lib_has_std" ];
}; };
resolvedDefaultFeatures = [ "default" "std" ]; resolvedDefaultFeatures = [ "default" "std" ];
}; };
"derive_builder_core" = rec { "derive_builder_core" = rec {
crateName = "derive_builder_core"; crateName = "derive_builder_core";
version = "0.12.0"; version = "0.20.2";
edition = "2015"; edition = "2018";
sha256 = "03vvmw3mfg370swq0dh2h5kcjjb8va2m4asqgp9wfyy4l08xq6y1"; sha256 = "1s640r6q46c2iiz25sgvxw3lk6b6v5y8hwylng7kas2d09xwynrd";
authors = [ authors = [
"Colin Kiegel <kiegel@gmx.de>" "Colin Kiegel <kiegel@gmx.de>"
"Pascal Hertleif <killercup@gmail.com>" "Pascal Hertleif <killercup@gmail.com>"
@ -3247,7 +3157,7 @@ rec {
dependencies = [ dependencies = [
{ {
name = "darling"; name = "darling";
packageId = "darling 0.14.4"; packageId = "darling";
} }
{ {
name = "proc-macro2"; name = "proc-macro2";
@ -3259,17 +3169,18 @@ rec {
} }
{ {
name = "syn"; name = "syn";
packageId = "syn 1.0.109"; packageId = "syn 2.0.76";
features = [ "full" "extra-traits" ]; features = [ "full" "extra-traits" ];
} }
]; ];
features = { }; features = { };
resolvedDefaultFeatures = [ "lib_has_std" ];
}; };
"derive_builder_macro" = rec { "derive_builder_macro" = rec {
crateName = "derive_builder_macro"; crateName = "derive_builder_macro";
version = "0.12.0"; version = "0.20.2";
edition = "2015"; edition = "2018";
sha256 = "17p71qzh7x1q2yxzz3xrg73zw3xl0h479b7ybyjm0s1rg9fa7kgb"; sha256 = "0g1zznpqrmvjlp2w7p0jzsjvpmw5rvdag0rfyypjhnadpzib0qxb";
procMacro = true; procMacro = true;
authors = [ authors = [
"Colin Kiegel <kiegel@gmx.de>" "Colin Kiegel <kiegel@gmx.de>"
@ -3284,13 +3195,16 @@ rec {
} }
{ {
name = "syn"; name = "syn";
packageId = "syn 1.0.109"; packageId = "syn 2.0.76";
features = [ "full" "extra-traits" ]; features = [ "full" "extra-traits" ];
} }
]; ];
features = { features = {
"alloc" = [ "derive_builder_core/alloc" ];
"clippy" = [ "derive_builder_core/clippy" ]; "clippy" = [ "derive_builder_core/clippy" ];
"lib_has_std" = [ "derive_builder_core/lib_has_std" ];
}; };
resolvedDefaultFeatures = [ "lib_has_std" ];
}; };
"diff" = rec { "diff" = rec {
crateName = "diff"; crateName = "diff";
@ -7932,9 +7846,9 @@ rec {
}; };
"oci-spec" = rec { "oci-spec" = rec {
crateName = "oci-spec"; crateName = "oci-spec";
version = "0.6.4"; version = "0.7.0";
edition = "2021"; edition = "2021";
sha256 = "02b3vsvsagd1h5gf4kb9z5b080kr0y8z34d9zgxblm1ry7pzi143"; sha256 = "0qxk3yrzg91dk801g29fmbq7zb8bgkc4rqwlw52ww76gwxf1ivjw";
libName = "oci_spec"; libName = "oci_spec";
authors = [ authors = [
"Furisto" "Furisto"
@ -7950,6 +7864,10 @@ rec {
name = "getset"; name = "getset";
packageId = "getset"; packageId = "getset";
} }
{
name = "regex";
packageId = "regex";
}
{ {
name = "serde"; name = "serde";
packageId = "serde"; packageId = "serde";
@ -7959,6 +7877,14 @@ rec {
name = "serde_json"; name = "serde_json";
packageId = "serde_json"; packageId = "serde_json";
} }
{
name = "strum";
packageId = "strum";
}
{
name = "strum_macros";
packageId = "strum_macros";
}
{ {
name = "thiserror"; name = "thiserror";
packageId = "thiserror"; packageId = "thiserror";
@ -12002,7 +11928,7 @@ rec {
dependencies = [ dependencies = [
{ {
name = "darling"; name = "darling";
packageId = "darling 0.20.8"; packageId = "darling";
} }
{ {
name = "proc-macro2"; name = "proc-macro2";
@ -12419,17 +12345,7 @@ rec {
"serde" = [ "dep:serde" ]; "serde" = [ "dep:serde" ];
}; };
}; };
"strsim 0.10.0" = rec { "strsim" = rec {
crateName = "strsim";
version = "0.10.0";
edition = "2015";
sha256 = "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk";
authors = [
"Danny Guo <danny@dannyguo.com>"
];
};
"strsim 0.11.1" = rec {
crateName = "strsim"; crateName = "strsim";
version = "0.11.1"; version = "0.11.1";
edition = "2015"; edition = "2015";
@ -12507,6 +12423,56 @@ rec {
} }
]; ];
};
"strum" = rec {
crateName = "strum";
version = "0.26.3";
edition = "2018";
sha256 = "01lgl6jvrf4j28v5kmx9bp480ygf1nhvac8b4p7rcj9hxw50zv4g";
authors = [
"Peter Glotfelty <peter.glotfelty@microsoft.com>"
];
features = {
"default" = [ "std" ];
"derive" = [ "strum_macros" ];
"phf" = [ "dep:phf" ];
"strum_macros" = [ "dep:strum_macros" ];
};
resolvedDefaultFeatures = [ "default" "std" ];
};
"strum_macros" = rec {
crateName = "strum_macros";
version = "0.26.4";
edition = "2018";
sha256 = "1gl1wmq24b8md527cpyd5bw9rkbqldd7k1h38kf5ajd2ln2ywssc";
procMacro = true;
authors = [
"Peter Glotfelty <peter.glotfelty@microsoft.com>"
];
dependencies = [
{
name = "heck";
packageId = "heck 0.5.0";
}
{
name = "proc-macro2";
packageId = "proc-macro2";
}
{
name = "quote";
packageId = "quote";
}
{
name = "rustversion";
packageId = "rustversion";
}
{
name = "syn";
packageId = "syn 2.0.76";
features = [ "parsing" "extra-traits" ];
}
];
}; };
"subtle" = rec { "subtle" = rec {
crateName = "subtle"; crateName = "subtle";

2
tvix/build/Cargo.toml
View file

@ -24,7 +24,7 @@ blake3 = "1.5.0"
bstr = "1.6.0" bstr = "1.6.0"
data-encoding = "2.5.0" data-encoding = "2.5.0"
futures = "0.3.30" futures = "0.3.30"
oci-spec = "0.6.4" oci-spec = "0.7.0"
serde_json = "1.0.111" serde_json = "1.0.111"
tvix-tracing = { path = "../tracing" } tvix-tracing = { path = "../tracing" }
uuid = { version = "1.7.0", features = ["v4"] } uuid = { version = "1.7.0", features = ["v4"] }

4
tvix/build/src/oci/spec.rs
View file

@ -155,8 +155,8 @@ fn configure_process<'a>(
.ambient(caps) .ambient(caps)
.build()? .build()?
}) })
.rlimits([oci_spec::runtime::LinuxRlimitBuilder::default() .rlimits([oci_spec::runtime::PosixRlimitBuilder::default()
.typ(oci_spec::runtime::LinuxRlimitType::RlimitNofile) .typ(oci_spec::runtime::PosixRlimitType::RlimitNofile)
.hard(1024_u64) .hard(1024_u64)
.soft(1024_u64) .soft(1024_u64)
.build()?]) .build()?])