drewrisinger
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore initial generateTestOkHash

This commit is contained in:
Astro 2019-04-23 21:14:46 +02:00
parent 5d7889357a
commit 5145f5d723
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.nix
View File

@ -24,7 +24,7 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; } generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
'' ''
TMPDIR=`mktemp -d` TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed2 cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed
HASH=`nix-hash --type sha256 --base32 $TMPDIR` HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out echo \"$HASH\" > $out
''; '';
@ -104,7 +104,7 @@ in
${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&set ARTIQ_LOW_LATENCY=1&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&set ARTIQ_LOW_LATENCY=1&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh
mkdir $out mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed2 cp ${generatedNix}/pkgs/artiq-version.nix $out/passed
''; '';
}; };
} }