From 81d144d716e182c96ec9b0f2ef51bf70adcfd666 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 19 Oct 2020 12:10:11 +0200 Subject: [PATCH] Remove exp attrset from report Fixes #43 --- garlic/report.nix | 4 +--- overlay.nix | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/garlic/report.nix b/garlic/report.nix index e10e045..a5c726d 100644 --- a/garlic/report.nix +++ b/garlic/report.nix @@ -1,7 +1,6 @@ { stdenv , fig -, exp , writeText , busybox , jq @@ -9,7 +8,6 @@ }: let figJSON = writeText "fig.json" (builtins.toJSON fig); - expJSON = writeText "exp.json" (builtins.toJSON exp); in stdenv.mkDerivation { name = "report"; @@ -19,8 +17,8 @@ in ls -l sed -i -e "s:@fig\.nbody\.test@:$(jq -r .nbody.test ${figJSON}):g" report.tex jq . ${figJSON} - jq . ${expJSON} pdflatex report.tex -o report.pdf + # Run again to fix figure references pdflatex report.tex -o report.pdf ''; installPhase = '' diff --git a/overlay.nix b/overlay.nix index d2f8b4b..213a2d1 100644 --- a/overlay.nix +++ b/overlay.nix @@ -164,7 +164,6 @@ let report = callPackage ./garlic/report.nix { fig = self.bsc.garlic.fig; - exp = self.bsc.garlic.exp; }; # Use the configuration for the following target machine