git.delta.rocks / jrsonnet / refs/commits / be1ca0e13d7d

difftreelog

fix avoid problematic serde release

Yaroslav Bolyukin2023-08-19parent: #19baaf2.patch.diff
in: master
It doesn't work with the downstream nix users of jrsonnet, and may cause
security issues.

Upstream issue: https://github.com/serde-rs/serde/issues/2538

7 files changed

modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,9 @@
 
 jrsonnet-gcmodule = "0.3.6"
 
+# <= 1.0.171 due to serde-rs/serde#2538
+serde = { version = ">= 1.0.126, <= 1.0.171" }
+
 #[profile.test]
 #opt-level = 1
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
before · cmds/jrsonnet/Cargo.toml
1[package]2name = "jrsonnet"3description = "Rust jsonnet implementation"4version.workspace = true5repository.workspace = true6authors = ["Yaroslav Bolyukin <iam@lach.pw>"]7license = "MIT"8edition = "2021"910[features]11experimental = ["exp-preserve-order", "exp-destruct", "exp-null-coaelse", "exp-object-iteration", "exp-bigint", "exp-apply"]12# Use mimalloc as allocator13mimalloc = ["mimallocator"]14# Experimental feature, which allows to preserve order of object fields15exp-preserve-order = [16    "jrsonnet-evaluator/exp-preserve-order",17    "jrsonnet-cli/exp-preserve-order",18]19# Destructuring of locals20exp-destruct = ["jrsonnet-evaluator/exp-destruct"]21# Iteration over objects yields [key, value] elements22exp-object-iteration = ["jrsonnet-evaluator/exp-object-iteration"]23# Bigint type24exp-bigint = ["jrsonnet-evaluator/exp-bigint", "jrsonnet-cli/exp-bigint"]25# obj?.field, obj?.['field']26exp-null-coaelse = ["jrsonnet-evaluator/exp-null-coaelse", "jrsonnet-parser/exp-null-coaelse", "jrsonnet-cli/exp-null-coaelse"]27# --exp-apply28exp-apply = []2930# std.thisFile support31legacy-this-file = ["jrsonnet-cli/legacy-this-file"]3233nightly = ["jrsonnet-evaluator/nightly"]3435[dependencies]36jrsonnet-evaluator.workspace = true37jrsonnet-parser.workspace = true38jrsonnet-cli.workspace = true39jrsonnet-gcmodule.workspace = true4041mimallocator = { version = "0.1.3", optional = true }42thiserror = "1.0"43clap = { version = "4.1", features = ["derive"] }44clap_complete = { version = "4.1" }
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -47,7 +47,7 @@
 # Friendly errors
 strsim = { version = "0.10.0" }
 
-serde = "1.0"
+serde.workspace = true
 
 anyhow = { version = "1.0", optional = true }
 # Serialized stdlib
modifiedcrates/jrsonnet-interner/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -19,7 +19,7 @@
 [dependencies]
 jrsonnet-gcmodule.workspace = true
 
-serde = { version = "1.0", optional = true }
+serde = { workspace = true, optional = true }
 structdump = { version = "0.2.0", optional = true }
 
 rustc-hash = "1.1"
modifiedcrates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -35,5 +35,5 @@
 
 peg = "0.8.1"
 
-serde = { version = "1.0", features = ["derive", "rc"], optional = true }
+serde = { workspace = true, features = ["derive", "rc"], optional = true }
 structdump = { version = "0.2.0", features = ["derive"], optional = true }
modifiedcrates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -30,7 +30,7 @@
 # Used for stdlib AST serialization
 bincode = { version = "1.3", optional = true }
 # Used both for stdlib AST serialization and std.parseJson/std.parseYaml
-serde = "1.0"
+serde.workspace = true
 
 # std.md5
 md5 = "0.7.0"
modifiedtests/Cargo.tomldiffbeforeafterboth
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -8,4 +8,4 @@
 jrsonnet-evaluator.workspace = true
 jrsonnet-gcmodule.workspace = true
 jrsonnet-stdlib.workspace = true
-serde = "1.0.142"
+serde.workspace = true