From 5145f5d72310ae44129ba861852765f0cbe68798 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Tue, 23 Apr 2019 21:14:46 +0200 Subject: [PATCH] restore initial generateTestOkHash --- main.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.nix b/main.nix index e7ca617..fe442db 100644 --- a/main.nix +++ b/main.nix @@ -24,7 +24,7 @@ let generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; } '' 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` 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 mkdir $out - cp ${generatedNix}/pkgs/artiq-version.nix $out/passed2 + cp ${generatedNix}/pkgs/artiq-version.nix $out/passed ''; }; }