Remove exp attrset from report

Fixes #43
This commit is contained in:
Rodrigo Arias 2020-10-19 12:10:11 +02:00
parent 30ad4219d9
commit 81d144d716
2 changed files with 1 additions and 4 deletions

View File

@ -1,7 +1,6 @@
{ {
stdenv stdenv
, fig , fig
, exp
, writeText , writeText
, busybox , busybox
, jq , jq
@ -9,7 +8,6 @@
}: }:
let let
figJSON = writeText "fig.json" (builtins.toJSON fig); figJSON = writeText "fig.json" (builtins.toJSON fig);
expJSON = writeText "exp.json" (builtins.toJSON exp);
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "report"; name = "report";
@ -19,8 +17,8 @@ in
ls -l ls -l
sed -i -e "s:@fig\.nbody\.test@:$(jq -r .nbody.test ${figJSON}):g" report.tex sed -i -e "s:@fig\.nbody\.test@:$(jq -r .nbody.test ${figJSON}):g" report.tex
jq . ${figJSON} jq . ${figJSON}
jq . ${expJSON}
pdflatex report.tex -o report.pdf pdflatex report.tex -o report.pdf
# Run again to fix figure references
pdflatex report.tex -o report.pdf pdflatex report.tex -o report.pdf
''; '';
installPhase = '' installPhase = ''

View File

@ -164,7 +164,6 @@ let
report = callPackage ./garlic/report.nix { report = callPackage ./garlic/report.nix {
fig = self.bsc.garlic.fig; fig = self.bsc.garlic.fig;
exp = self.bsc.garlic.exp;
}; };
# Use the configuration for the following target machine # Use the configuration for the following target machine