esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

cleanup

This commit is contained in:
Sebastien Bourdeauducq 2019-03-14 18:09:01 +08:00
parent 82a2d06496
commit 12518c0180
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.nix
View File

@ -20,7 +20,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/passed9 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
''; '';
@ -41,7 +41,7 @@ in
# One major downside of this hack is the tests are only run when generateTestOkHash # One major downside of this hack is the tests are only run when generateTestOkHash
# changes, i.e. when the ARTIQ version changes (and not the dependencies). # changes, i.e. when the ARTIQ version changes (and not the dependencies).
# Impure derivations, when they land in Nix/Hydra, should improve the situation. # Impure derivations, when they land in Nix/Hydra, should improve the situation.
kc705-tests = pkgs.stdenv.mkDerivation rec { kc705-tests = pkgs.stdenv.mkDerivation {
name = "kc705-tests"; name = "kc705-tests";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
@ -73,7 +73,7 @@ in
export ARTIQ_LOW_LATENCY=1 export ARTIQ_LOW_LATENCY=1
python -m unittest discover -v artiq.test.coredevice python -m unittest discover -v artiq.test.coredevice
mkdir $out mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed9 cp ${generatedNix}/pkgs/artiq-version.nix $out/passed
''; '';
}; };
} }