From fb0c412bb09469f7ab43b11172ba403bd3fda023 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sun, 6 Jun 2021 18:30:25 +0200
Subject: [PATCH 1/3] extras: updated flake8-artiq

---
 artiq-full/extras.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 33e3a83..b1ea90b 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -231,8 +231,8 @@ in
     withManual = false;
     src = pkgs.fetchgit {
       url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
-      rev = "1e521fe76f8c2adeaec1c6c6301ec9a2bd2c6382";
-      sha256 = "1w698i1yp1v3sp09i90mcswjk0i3vpfdr7hd73dplk7wjldxrmv8";
+      rev = "779e41c8cf3e05dac4b7c2802640eb0442cf65d9";
+      sha256 = "1vz6m1w1i1xf72wqzl4ahlv9mcxa6zn8wv05s4yq4cph0hk6inn0";
     };
     pythonOptions = {
       propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
-- 
2.42.0


From a162c7a65e261c86b1f8c8050eb70a5260583b8c Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sun, 6 Jun 2021 18:48:39 +0200
Subject: [PATCH 2/3] extras: added dax package

---
 artiq-full/extras.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index b1ea90b..677b87d 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -245,4 +245,27 @@ in
         '';
     };
     condaOptions = { dependencies = [ "flake8" ]; };
+  }) // (dualPackage {
+    name = "dax";
+    version = "6.3";
+    withManual = false;
+    src = pkgs.fetchgit {
+      url = "https://gitlab.com/duke-artiq/dax.git";
+      rev = "v${version}";
+      sha256 = "1agxyx2rxylrwc3zyz2czdbfv2sxrx5mrwahm0n7gnn87f32h36v";
+    };
+    pythonOptions = {
+      VERSIONEER_OVERRIDE = version;
+      inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
+      propagatedBuildInputs = [ artiq sipyco ]
+        ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx ]);
+      checkInputs = [ pkgs.python3Packages.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
+      checkPhase =
+        ''
+        pytest
+        mypy
+        flake8
+        '';
+    };
+    condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" ]; };
   })
-- 
2.42.0


From a3fd10cef0b745c4f36d2fa9c73221d3cb86f748 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sun, 6 Jun 2021 18:59:24 +0200
Subject: [PATCH 3/3] extras: added dax-applets package

---
 artiq-full.nix        |  2 +-
 artiq-full/extras.nix | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/artiq-full.nix b/artiq-full.nix
index ed0e136..b0e6261 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -214,7 +214,7 @@ let
             echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
             ";
         })) drtio-systems;
-      extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
+      extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial pyqtgraph-qt5 artiq; };
     in
       artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
         conda-artiq-board-kasli-tester = conda-artiq-board {
diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 677b87d..72c889e 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -1,4 +1,4 @@
-{ pkgs, sipyco, asyncserial, artiq }:
+{ pkgs, sipyco, asyncserial, pyqtgraph-qt5, artiq }:
 let
   condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
   condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
@@ -268,4 +268,24 @@ in
         '';
     };
     condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" ]; };
+  }) // (dualPackage {
+    name = "dax-applets";
+    version = "0.0.0";
+    withManual = false;
+    src = pkgs.fetchgit {
+      url = "https://gitlab.com/duke-artiq/dax-applets.git";
+      rev = "e25f0c83ef246d2913cbd97379b67ac02896745b";
+      sha256 = "0d0fkw27bhd0hky512km6iiiagwkdzw4vxgcd4cjq08nmh72jxv1";
+    };
+    pythonOptions = {
+      propagatedBuildInputs = [ artiq pyqtgraph-qt5 ];
+        ++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
+      checkInputs = [ pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
+      checkPhase =
+        ''
+        mypy
+        flake8
+        '';
+    };
+    condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
   })
-- 
2.42.0