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

remove artiq asyncserial dependency

This commit is contained in:
Sebastien Bourdeauducq 2019-04-20 10:57:56 +08:00
parent 3632841b27
commit aa038520e9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/conda-artiq-deps.nix
View File

@ -7,7 +7,6 @@
"scipy" "scipy"
"numpy" "numpy"
"prettytable" "prettytable"
"asyncserial"
"h5py 2.8" "h5py 2.8"
"python-dateutil" "python-dateutil"
"pyqt >=5.5" "pyqt >=5.5"

2
artiq/pkgs/artiq.nix
View File

@ -9,7 +9,7 @@ in
src = import ./artiq-src.nix { inherit fetchgit; }; src = import ./artiq-src.nix { inherit fetchgit; };
preBuild = "export VERSIONEER_OVERRIDE=${version}"; preBuild = "export VERSIONEER_OVERRIDE=${version}";
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ] propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
++ (with pythonDeps; [ levenshtein pyqtgraph-qt5 quamash pythonparser asyncserial ]) ++ (with pythonDeps; [ levenshtein pyqtgraph-qt5 quamash pythonparser ])
++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]); ++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
checkInputs = [ binutils-or1k outputcheck ]; checkInputs = [ binutils-or1k outputcheck ];
checkPhase = checkPhase =