From aa038520e958344c1bb596b4844fcc3c119f1b26 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 20 Apr 2019 10:57:56 +0800 Subject: [PATCH] remove artiq asyncserial dependency --- artiq/conda-artiq-deps.nix | 1 - artiq/pkgs/artiq.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/artiq/conda-artiq-deps.nix b/artiq/conda-artiq-deps.nix index e1371e3..be5dfde 100644 --- a/artiq/conda-artiq-deps.nix +++ b/artiq/conda-artiq-deps.nix @@ -7,7 +7,6 @@ "scipy" "numpy" "prettytable" - "asyncserial" "h5py 2.8" "python-dateutil" "pyqt >=5.5" diff --git a/artiq/pkgs/artiq.nix b/artiq/pkgs/artiq.nix index b7465a8..7c9d4fa 100644 --- a/artiq/pkgs/artiq.nix +++ b/artiq/pkgs/artiq.nix @@ -9,7 +9,7 @@ in src = import ./artiq-src.nix { inherit fetchgit; }; preBuild = "export VERSIONEER_OVERRIDE=${version}"; 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 ]); checkInputs = [ binutils-or1k outputcheck ]; checkPhase =