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

fix(tvix/eval): implement cppnix JSON-serialisation semantics

Browse source 
This drops the usage of serde::Serialize, as the trait can not be used
to implement the correct semantics (function colouring!).

Instead, a manual JSON serialisation function is written which
correctly handles toString, outPath and other similar weirdnesses.

Unexpectedly, the eval-okay-tojson test from the C++ Nix test suite
now passes, too.

This fixes an issue where serialising data structures containing
derivations to JSON would fail.

Change-Id: I5c39e3d8356ee93a07eda481410f88610f6dd9f8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8209
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-03-04 02:12:06 +03:00 • committed by tazjin
parent 1e37f8b52e
commit 939cebd0f1
12 changed files with 138 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/eval/src/value/list.rs
View file

@ -4,7 +4,7 @@ use std::rc::Rc;
use imbl::{vector, Vector};
use serde::{Deserialize, Serialize};
use serde::Deserialize;
use crate::generators;
use crate::generators::GenCo;
@ -16,7 +16,7 @@ use super::TotalDisplay;
use super::Value;
#[repr(transparent)]
#[derive(Clone, Debug, Deserialize, Serialize)]
#[derive(Clone, Debug, Deserialize)]
pub struct NixList(Rc<Vector<Value>>);
impl TotalDisplay for NixList {