From 1d9726fe2fbc61d6edf65001b47a8a705c14c857 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Tue, 23 Feb 2021 00:39:52 +0100 Subject: [PATCH] artiq-fast: add jsonschema dependency to artiq Fixes issue #43 --- artiq-fast/conda/artiq.nix | 1 + artiq-fast/pkgs/artiq.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/artiq-fast/conda/artiq.nix b/artiq-fast/conda/artiq.nix index ab21777..4b07e00 100644 --- a/artiq-fast/conda/artiq.nix +++ b/artiq-fast/conda/artiq.nix @@ -21,6 +21,7 @@ let "pygit2" "python-levenshtein" "sipyco" + "jsonschema" ]; extraYaml = '' diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix index 78be5a0..49d0dc2 100644 --- a/artiq-fast/pkgs/artiq.nix +++ b/artiq-fast/pkgs/artiq.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ] ++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ]) ++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ]) - ++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]) + ++ (with python3Packages; [ pygit2 numpy dateutil jsonschema scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]) ++ [(if (lib.strings.versionAtLeast version "6.0") then pythonDeps.qasync else python3Packages.quamash)]; dontWrapQtApps = true;