From 72fa46ca7b4c6f63238f3c0efc93fcd6a1b17bd0 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sat, 26 Jun 2021 14:23:52 -0400
Subject: [PATCH 1/4] extras: enabled testing for dax

---
 artiq-full/extras.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 3412543..1bc4dce 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -259,14 +259,7 @@ in
       inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
       propagatedBuildInputs = [ artiq sipyco ]
         ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx ]);
-      doCheck = false;
-      checkInputs = [ pkgs.python3Packages.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
-      checkPhase =
-        ''
-        pytest
-        mypy
-        flake8
-        '';
+      checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
     };
     condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" ]; };
   }) // (dualPackage {
-- 
2.44.1


From b8444a087578408246977e9b76bc36ebcea1378e Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sat, 26 Jun 2021 14:27:22 -0400
Subject: [PATCH 2/4] extras: simplified testing of flake8-artiq and
 dax-applets

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

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 1bc4dce..6e66f7a 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -236,13 +236,7 @@ in
     };
     pythonOptions = {
       propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
-      checkInputs = [ pkgs.python3Packages.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
-      checkPhase =
-        ''
-        pytest
-        mypy
-        flake8
-        '';
+      checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
     };
     condaOptions = { dependencies = [ "flake8" ]; };
   }) // (dualPackage rec {
@@ -274,12 +268,7 @@ in
     pythonOptions = {
       propagatedBuildInputs = [ artiq pyqtgraph-qt5 ]
         ++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
-      checkInputs = [ pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
-      checkPhase =
-        ''
-        mypy
-        flake8
-        '';
+      doCheck = false;
     };
     condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
   })
-- 
2.44.1


From 17efabf4a92ee40b03052b75a2fab8e7a63c6f37 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Tue, 29 Jun 2021 13:41:39 -0400
Subject: [PATCH 3/4] extras: bumped dax version to 6.4

---
 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 6e66f7a..5b4627c 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -241,12 +241,12 @@ in
     condaOptions = { dependencies = [ "flake8" ]; };
   }) // (dualPackage rec {
     name = "dax";
-    version = "6.3";
+    version = "6.4";
     withManual = false;
     src = pkgs.fetchgit {
       url = "https://gitlab.com/duke-artiq/dax.git";
       rev = "v${version}";
-      sha256 = "17bgqal8iyajnmp11wd59k4i8gpa3zf3cm7v8mjail5c8bnwyl4c";
+      sha256 = "08w0fpyyhk78i1qmych9kq3va02sm5k1z14yhzrfk9hhf5r7ypf8";
     };
     pythonOptions = {
       VERSIONEER_OVERRIDE = version;
-- 
2.44.1


From ee4014f0085fdef3ebf77da165c4751de1f2bb38 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Mon, 5 Jul 2021 17:39:58 -0400
Subject: [PATCH 4/4] extras: added enabled flag for dualpackage, only build
 dax for matching artiq version

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

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 5b4627c..88587f5 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -3,8 +3,8 @@ let
   condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
   condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
   dualPackage = (
-    { name, version, src, pythonOptions ? {}, condaOptions ? {}, withManual ? true}:
-      {
+    { name, version, src, pythonOptions ? {}, condaOptions ? {}, enabled ? true, withManual ? true}:
+      pkgs.lib.optionalAttrs enabled ({
         "${name}" = pkgs.python3Packages.buildPythonPackage ({
           inherit version;
           name = "${name}-${version}";
@@ -38,7 +38,7 @@ let
               echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
               '';
         };
-      })
+      }))
     );
   # https://github.com/m-labs/artiq/issues/23
   hidapi = pkgs.hidapi.overrideAttrs (oa: {
@@ -242,6 +242,7 @@ in
   }) // (dualPackage rec {
     name = "dax";
     version = "6.4";
+    enabled = builtins.head (builtins.splitVersion version) == builtins.head (builtins.splitVersion artiq.version);
     withManual = false;
     src = pkgs.fetchgit {
       url = "https://gitlab.com/duke-artiq/dax.git";
-- 
2.44.1