occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

use nixpkgs outputcheck 

Signed-off-by: Florian Agbuya <fa@m-labs.ph>
This commit is contained in:
Florian Agbuya 2024-03-25 16:16:25 +08:00 committed by Sébastien Bourdeauducq
parent aea5f04d74
commit bc8bc952d7
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -92,22 +92,6 @@
disabledTestPaths = [ "tests/test_qeventloop.py" ]; disabledTestPaths = [ "tests/test_qeventloop.py" ];
}; };
outputcheck = pkgs.python3Packages.buildPythonApplication rec {
pname = "outputcheck";
version = "0.4.2";
src = pkgs.fetchFromGitHub {
owner = "stp";
repo = "OutputCheck";
rev = "e0f533d3c5af2949349856c711bf4bca50022b48";
sha256 = "1y27vz6jq6sywas07kz3v01sqjd0sga9yv9w2cksqac3v7wmf2a0";
};
prePatch = "echo ${version} > RELEASE-VERSION";
postPatch = ''
substituteInPlace OutputCheck/Driver.py \
--replace "argparse.FileType('rU')" "argparse.FileType('r')"
'';
};
libartiq-support = pkgs.stdenv.mkDerivation { libartiq-support = pkgs.stdenv.mkDerivation {
name = "libartiq-support"; name = "libartiq-support";
src = self; src = self;
@ -187,7 +171,7 @@
# FIXME: automatically propagate lld_14 llvm_14 dependencies # FIXME: automatically propagate lld_14 llvm_14 dependencies
# cacert is required in the check stage only, as certificates are to be # cacert is required in the check stage only, as certificates are to be
# obtained from system elsewhere # obtained from system elsewhere
nativeCheckInputs = [ pkgs.lld_14 pkgs.llvm_14 libartiq-support pkgs.lit outputcheck pkgs.cacert ]; nativeCheckInputs = with pkgs; [ lld_14 llvm_14 lit outputcheck cacert ] ++ [ libartiq-support ];
checkPhase = '' checkPhase = ''
python -m unittest discover -v artiq.test python -m unittest discover -v artiq.test
@ -461,7 +445,7 @@
artiq-frontend-dev-wrappers artiq-frontend-dev-wrappers
# To manually run compiler tests: # To manually run compiler tests:
pkgs.lit pkgs.lit
outputcheck pkgs.outputcheck
libartiq-support libartiq-support
# use the vivado-env command to enter a FHS shell that lets you run the Vivado installer # use the vivado-env command to enter a FHS shell that lets you run the Vivado installer
packages.x86_64-linux.vivadoEnv packages.x86_64-linux.vivadoEnv