From 02b6b6c5644022a7e0aa80b71fc9a9586aca1ef3 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 19 Sep 2022 11:46:38 +0200 Subject: fix(nixery): Discard string context before parsing with fromJSON Discard string context in prepare-image.nix before parsing input read with readFile with fromJSON. Required for compatibility with nix >2.3. Change-Id: I3830707e80fd19a700551a15f1a96d2841d0b022 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6696 Reviewed-by: tazjin Tested-by: BuildkiteCI --- tools/nixery/prepare-image/prepare-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/nixery/prepare-image/prepare-image.nix b/tools/nixery/prepare-image/prepare-image.nix index bb88983cf6..a48545905e 100644 --- a/tools/nixery/prepare-image/prepare-image.nix +++ b/tools/nixery/prepare-image/prepare-image.nix @@ -155,7 +155,7 @@ let # Metadata about the symlink layer which is required for serving it. # Two different hashes are computed for different usages (inclusion # in manifest vs. content-checking in the layer cache). - symlinkLayerMeta = fromJSON (readFile (runCommand "symlink-layer-meta.json" + symlinkLayerMeta = fromJSON (builtins.unsafeDiscardStringContext (readFile (runCommand "symlink-layer-meta.json" { buildInputs = [ coreutils jq openssl ]; } '' @@ -164,11 +164,11 @@ let jq -n -c --arg tarHash $tarHash --arg size $layerSize --arg path ${symlinkLayer} \ '{ size: ($size | tonumber), tarHash: $tarHash, path: $path }' >> $out - '')); + ''))); # Final output structure returned to Nixery if the build succeeded buildOutput = { - runtimeGraph = fromJSON (readFile runtimeGraph); + runtimeGraph = fromJSON (builtins.unsafeDiscardStringContext (readFile runtimeGraph)); symlinkLayer = symlinkLayerMeta; }; -- cgit 1.4.1