From b509b728dd405543ba08142299c3f4c04abb3fe8 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 24 Apr 2019 15:17:28 +0800 Subject: [PATCH] restore initial generateTestOkHash --- main.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.nix b/main.nix index fc99211..3b02e99 100644 --- a/main.nix +++ b/main.nix @@ -26,7 +26,7 @@ let generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; } '' TMPDIR=`mktemp -d` - cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed3 + cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed HASH=`nix-hash --type sha256 --base32 $TMPDIR` echo \"$HASH\" > $out ''; @@ -103,7 +103,7 @@ in ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh mkdir $out - cp ${generatedNix}/pkgs/artiq-version.nix $out/passed3 + cp ${generatedNix}/pkgs/artiq-version.nix $out/passed ''; }; }