From b4ccaac7ad135249eb0b1866acf4c8e68fd5bdb9 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 10 Oct 2024 19:50:19 +0200 Subject: chore(tvix/build): Bump oci-spec dependency 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 Autosubmit: Ilan Joselevich Tested-by: BuildkiteCI --- tvix/Cargo.nix | 236 ++++++++++++++++++++++++--------------------------------- 1 file changed, 101 insertions(+), 135 deletions(-) (limited to 'tvix/Cargo.nix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 7ef142fe162e..9db70d2abdd3 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -2264,7 +2264,7 @@ rec { } { name = "strsim"; - packageId = "strsim 0.11.1"; + packageId = "strsim"; optional = true; } ]; @@ -2943,47 +2943,22 @@ rec { ]; }; - "darling 0.14.4" = rec { + "darling" = rec { crateName = "darling"; - version = "0.14.4"; - edition = "2018"; - sha256 = "0l1qrn805bsxa0iy7x8bmdwr8c10hlw0yiqs8ckv7lbz86rhqxbv"; - authors = [ - "Ted Driggs " - ]; - dependencies = [ - { - name = "darling_core"; - packageId = "darling_core 0.14.4"; - } - { - name = "darling_macro"; - packageId = "darling_macro 0.14.4"; - } - ]; - features = { - "default" = [ "suggestions" ]; - "diagnostics" = [ "darling_core/diagnostics" ]; - "suggestions" = [ "darling_core/suggestions" ]; - }; - resolvedDefaultFeatures = [ "default" "suggestions" ]; - }; - "darling 0.20.8" = rec { - crateName = "darling"; - version = "0.20.8"; - edition = "2018"; - sha256 = "14a38qsi9104kvk1z11rqj0bnz1866dyhnvgvbgzz17d2g6nzqsl"; + version = "0.20.10"; + edition = "2021"; + sha256 = "1299h2z88qn71mizhh05j26yr3ik0wnqmw11ijds89l8i9nbhqvg"; authors = [ "Ted Driggs " ]; dependencies = [ { name = "darling_core"; - packageId = "darling_core 0.20.8"; + packageId = "darling_core"; } { name = "darling_macro"; - packageId = "darling_macro 0.20.8"; + packageId = "darling_macro"; } ]; features = { @@ -2993,53 +2968,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "suggestions" ]; }; - "darling_core 0.14.4" = rec { + "darling_core" = rec { crateName = "darling_core"; - version = "0.14.4"; - edition = "2018"; - sha256 = "1w4b2ndxmkwghwq84yphk8x15jnpivm08w596g12ry5pwsk1r70h"; - authors = [ - "Ted Driggs " - ]; - 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; - } - { - 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"; + version = "0.20.10"; + edition = "2021"; + sha256 = "1rgr9nci61ahnim93yh3xy6fkfayh7sk4447hahawah3m1hkh4wm"; authors = [ "Ted Driggs " ]; @@ -3062,7 +2995,7 @@ rec { } { name = "strsim"; - packageId = "strsim 0.10.0"; + packageId = "strsim"; optional = true; } { @@ -3077,36 +3010,11 @@ rec { }; resolvedDefaultFeatures = [ "strsim" "suggestions" ]; }; - "darling_macro 0.14.4" = rec { + "darling_macro" = rec { crateName = "darling_macro"; - version = "0.14.4"; - edition = "2018"; - sha256 = "13mlyd5w275c815k0ijf6g4c446hs8b3m2h4an5isqgpr7dv9am4"; - procMacro = true; - authors = [ - "Ted Driggs " - ]; - dependencies = [ - { - name = "darling_core"; - packageId = "darling_core 0.14.4"; - } - { - 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"; + version = "0.20.10"; + edition = "2021"; + sha256 = "01kq3ibbn47czijj39h3vxyw0c2ksd0jvc097smcrk7n2jjs4dnk"; procMacro = true; authors = [ "Ted Driggs " @@ -3114,7 +3022,7 @@ rec { dependencies = [ { name = "darling_core"; - packageId = "darling_core 0.20.8"; + packageId = "darling_core"; } { name = "quote"; @@ -3212,9 +3120,9 @@ rec { }; "derive_builder" = rec { crateName = "derive_builder"; - version = "0.12.0"; - edition = "2015"; - sha256 = "1y4p569zcvpmly5s5hmjp9h83drxvdp6kj6bb61h225mhj3pfrwd"; + version = "0.20.2"; + edition = "2018"; + sha256 = "0is9z7v3kznziqsxa5jqji3ja6ay9wzravppzhcaczwbx84znzah"; authors = [ "Colin Kiegel " "Pascal Hertleif " @@ -3228,16 +3136,18 @@ rec { } ]; features = { + "alloc" = [ "derive_builder_macro/alloc" ]; "clippy" = [ "derive_builder_macro/clippy" ]; "default" = [ "std" ]; + "std" = [ "derive_builder_macro/lib_has_std" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; }; "derive_builder_core" = rec { crateName = "derive_builder_core"; - version = "0.12.0"; - edition = "2015"; - sha256 = "03vvmw3mfg370swq0dh2h5kcjjb8va2m4asqgp9wfyy4l08xq6y1"; + version = "0.20.2"; + edition = "2018"; + sha256 = "1s640r6q46c2iiz25sgvxw3lk6b6v5y8hwylng7kas2d09xwynrd"; authors = [ "Colin Kiegel " "Pascal Hertleif " @@ -3247,7 +3157,7 @@ rec { dependencies = [ { name = "darling"; - packageId = "darling 0.14.4"; + packageId = "darling"; } { name = "proc-macro2"; @@ -3259,17 +3169,18 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.76"; features = [ "full" "extra-traits" ]; } ]; features = { }; + resolvedDefaultFeatures = [ "lib_has_std" ]; }; "derive_builder_macro" = rec { crateName = "derive_builder_macro"; - version = "0.12.0"; - edition = "2015"; - sha256 = "17p71qzh7x1q2yxzz3xrg73zw3xl0h479b7ybyjm0s1rg9fa7kgb"; + version = "0.20.2"; + edition = "2018"; + sha256 = "0g1zznpqrmvjlp2w7p0jzsjvpmw5rvdag0rfyypjhnadpzib0qxb"; procMacro = true; authors = [ "Colin Kiegel " @@ -3284,13 +3195,16 @@ rec { } { name = "syn"; - packageId = "syn 1.0.109"; + packageId = "syn 2.0.76"; features = [ "full" "extra-traits" ]; } ]; features = { + "alloc" = [ "derive_builder_core/alloc" ]; "clippy" = [ "derive_builder_core/clippy" ]; + "lib_has_std" = [ "derive_builder_core/lib_has_std" ]; }; + resolvedDefaultFeatures = [ "lib_has_std" ]; }; "diff" = rec { crateName = "diff"; @@ -7932,9 +7846,9 @@ rec { }; "oci-spec" = rec { crateName = "oci-spec"; - version = "0.6.4"; + version = "0.7.0"; edition = "2021"; - sha256 = "02b3vsvsagd1h5gf4kb9z5b080kr0y8z34d9zgxblm1ry7pzi143"; + sha256 = "0qxk3yrzg91dk801g29fmbq7zb8bgkc4rqwlw52ww76gwxf1ivjw"; libName = "oci_spec"; authors = [ "Furisto" @@ -7950,6 +7864,10 @@ rec { name = "getset"; packageId = "getset"; } + { + name = "regex"; + packageId = "regex"; + } { name = "serde"; packageId = "serde"; @@ -7959,6 +7877,14 @@ rec { name = "serde_json"; packageId = "serde_json"; } + { + name = "strum"; + packageId = "strum"; + } + { + name = "strum_macros"; + packageId = "strum_macros"; + } { name = "thiserror"; packageId = "thiserror"; @@ -12002,7 +11928,7 @@ rec { dependencies = [ { name = "darling"; - packageId = "darling 0.20.8"; + packageId = "darling"; } { name = "proc-macro2"; @@ -12419,17 +12345,7 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "strsim 0.10.0" = rec { - crateName = "strsim"; - version = "0.10.0"; - edition = "2015"; - sha256 = "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk"; - authors = [ - "Danny Guo " - ]; - - }; - "strsim 0.11.1" = rec { + "strsim" = rec { crateName = "strsim"; version = "0.11.1"; edition = "2015"; @@ -12507,6 +12423,56 @@ rec { } ]; + }; + "strum" = rec { + crateName = "strum"; + version = "0.26.3"; + edition = "2018"; + sha256 = "01lgl6jvrf4j28v5kmx9bp480ygf1nhvac8b4p7rcj9hxw50zv4g"; + authors = [ + "Peter Glotfelty " + ]; + 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 " + ]; + 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 { crateName = "subtle"; -- cgit 1.4.1