dax: reenable tests

This reverts commit 521b5ef7b7.

flake.lock

@@ -11,21 +11,23 @@
         "src-pythonparser": "src-pythonparser"
       },
       "locked": {
-        "lastModified": 1654087576,
+        "lastModified": 1669341018,
-        "narHash": "sha256-d+LCvCXikhhEjsf4qBZakx3Sda85p+4vVZVwE1YuS90=",
+        "narHash": "sha256-6tO/7AyiFfRdRLvA4p+lCQt9bRVN3n/dNWyGdKg43GM=",
-        "ref": "master",
+        "ref": "release-7",
-        "rev": "68ef0073ea66fe9c7f7c178979ecb8c681c47caa",
+        "rev": "75d75cc13c15ab57948dbaeb0467fa9c021e84c2",
-        "revCount": 8068,
+        "revCount": 8143,
         "type": "git",
         "url": "https://github.com/m-labs/artiq.git"
       },
       "original": {
+        "ref": "release-7",
         "type": "git",
         "url": "https://github.com/m-labs/artiq.git"
       }
     },
     "artiq-comtools": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "artiq",
           "nixpkgs"
@@ -36,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654007592,
+        "lastModified": 1664405593,
-        "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
+        "narHash": "sha256-yP441NerlLGig7n+9xHsx8yCtZ+Ggd0VqfBSzc20E04=",
         "owner": "m-labs",
         "repo": "artiq-comtools",
-        "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
+        "rev": "15ddac62813ef623a076ccf982b3bc63d314e651",
         "type": "github"
       },
       "original": {
@@ -49,14 +51,114 @@
         "type": "github"
       }
     },
+    "artiq-stubs": {
+      "inputs": {
+        "artiqpkgs": [
+          "daxpkgs",
+          "artiqpkgs"
+        ],
+        "flake8-artiq": [
+          "daxpkgs",
+          "flake8-artiq"
+        ],
+        "nixpkgs": [
+          "daxpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1670448913,
+        "narHash": "sha256-ZCg7Rd5qpYl5Y8FEtLObnFRUiSJVZuSBdpa57SMVoNE=",
+        "ref": "refs/heads/master",
+        "rev": "d592ccd1db4d9a97331d5397560d25b59c7820bb",
+        "revCount": 26,
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
+      }
+    },
+    "daxpkgs": {
+      "inputs": {
+        "artiq-stubs": "artiq-stubs",
+        "artiqpkgs": [
+          "artiq"
+        ],
+        "flake8-artiq": "flake8-artiq",
+        "nixpkgs": [
+          "artiq",
+          "nixpkgs"
+        ],
+        "sipyco": [
+          "artiq",
+          "sipyco"
+        ],
+        "trap-dac-utils": "trap-dac-utils"
+      },
+      "locked": {
+        "lastModified": 1671209611,
+        "narHash": "sha256-IBIdF8inxa21DTkonUKQ25bTy/1twpQQjU1g5rbBWxo=",
+        "ref": "refs/heads/master",
+        "rev": "1c47f53cca6ba455df5c2f6566f138f0b8495a4b",
+        "revCount": 1080,
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/dax.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/dax.git"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake8-artiq": {
+      "inputs": {
+        "artiqpkgs": [
+          "daxpkgs",
+          "artiqpkgs"
+        ],
+        "nixpkgs": [
+          "daxpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669758648,
+        "narHash": "sha256-nomQRpu/b8YTAma6kmbSRrz5D9l1l0TV+trKHukT1V8=",
+        "ref": "refs/heads/master",
+        "rev": "c4949e7a415d5e35a242d552d4bb83614693b92e",
+        "revCount": 85,
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
+      }
+    },
     "mozilla-overlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1650459918,
+        "lastModified": 1664789696,
-        "narHash": "sha256-sroCK+QJTmoXtcRkwZyKOP9iAYOPID2Bwdxn4GkG16w=",
+        "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168",
+        "rev": "80627b282705101e7b38e19ca6e8df105031b072",
         "type": "github"
       },
       "original": {
@@ -67,11 +169,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653920503,
+        "lastModified": 1666056570,
-        "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
+        "narHash": "sha256-e7EkIY68Tp7NKyp9JSHh6CgPPdsKYYWxiL4wZQN8Cwg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
+        "rev": "47edaa313fc3767ce3026037a5b62352f22f3602",
         "type": "github"
       },
       "original": {
@@ -83,7 +185,8 @@
     },
     "root": {
       "inputs": {
-        "artiq": "artiq"
+        "artiq": "artiq",
+        "daxpkgs": "daxpkgs"
       }
     },
     "sipyco": {
@@ -94,11 +197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654006751,
+        "lastModified": 1664319253,
-        "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
+        "narHash": "sha256-hycJAgy+NFF9f5I6++7yo8KdhMSyKCPKJazRPxeedI4=",
         "owner": "m-labs",
         "repo": "sipyco",
-        "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
+        "rev": "d58ded7280e0f020be2446d4fee70f4393e6045f",
         "type": "github"
       },
       "original": {
@@ -110,11 +213,11 @@
     "src-migen": {
       "flake": false,
       "locked": {
-        "lastModified": 1650337393,
+        "lastModified": 1662111470,
-        "narHash": "sha256-rm1SlFmF2ASz0vIy2nDEzGlyRw2oYNeJRr8Kh8Mg2Qc=",
+        "narHash": "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=",
         "owner": "m-labs",
         "repo": "migen",
-        "rev": "d4e3f34177c32f09904397179e6ed9c83175e528",
+        "rev": "639e66f4f453438e83d86dc13491b9403bbd8ec6",
         "type": "github"
       },
       "original": {
@@ -126,11 +229,11 @@
     "src-misoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1649324486,
+        "lastModified": 1665395741,
-        "narHash": "sha256-Mw/fQS3lHFvCm7L1k63joRkz5uyijQfywcOq+X2+o2s=",
+        "narHash": "sha256-7ULMGBPPn5NxZX6rdxU5GheoSNBiJklHQEVf04jU9tI=",
         "ref": "master",
-        "rev": "f1dc58d2b8c222ba41c25cee4301626625f46e43",
+        "rev": "4fb0730db4c5de7e86f82fa3bd204e6c4608af85",
-        "revCount": 2420,
+        "revCount": 2427,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/m-labs/misoc.git"
@@ -156,6 +259,31 @@
         "repo": "pythonparser",
         "type": "github"
       }
+    },
+    "trap-dac-utils": {
+      "inputs": {
+        "artiqpkgs": [
+          "daxpkgs",
+          "artiqpkgs"
+        ],
+        "nixpkgs": [
+          "daxpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1671136817,
+        "narHash": "sha256-6uVX0st+0rp0sl2i9MOepxPpgpjGdlfwZ7jndnNKR9k=",
+        "ref": "refs/heads/master",
+        "rev": "8b754f0735c5efd0e467bed7680f9d1d93d027c3",
+        "revCount": 261,
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,9 +1,18 @@
 {
   description = "Additional packages for ARTIQ";
 
-  inputs.artiq.url = git+https://github.com/m-labs/artiq.git;
+  inputs.artiq.url = git+https://github.com/m-labs/artiq.git?ref=release-7;
 
-  outputs = { self, artiq }:
+  inputs.daxpkgs = {
+    url = git+https://gitlab.com/duke-artiq/dax.git;
+    inputs = {
+      artiqpkgs.follows = "artiq";
+      nixpkgs.follows = "artiq/nixpkgs";
+      sipyco.follows = "artiq/sipyco";
+    };
+  };
+
+  outputs = { self, artiq, daxpkgs }:
     let
       pkgs = import artiq.inputs.nixpkgs { system = "x86_64-linux"; };
 
@@ -112,6 +121,7 @@
       };
       
     in rec {
+      inherit makeCondaChannel;
       packages.x86_64-linux = rec {
         korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
           pname = "korad_ka3005p";
@@ -141,8 +151,8 @@
           src = pkgs.fetchFromGitHub {
             owner = "m-labs";
             repo = "lda";
-            rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970";
+            rev = "2d8af1e9080a4c1ab4a32370b3f926bfba8c00b2";
-            sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn";
+            sha256 = "sha256-bImAsQiGmMauasltUrlkCRU3+p40d41DTlJvOjCfrP0=";
           };
           propagatedBuildInputs = [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ];
           postPatch = ''
@@ -206,32 +216,9 @@
             ++ [ artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]
             ++ (with pkgs.python3Packages; [ numpy scipy influxdb pyqtgraph setuptools ]);
         };
-        flake8-artiq = pkgs.python3Packages.buildPythonPackage {
+        flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq;
-          pname = "flake8-artiq";
+        dax = daxpkgs.packages.x86_64-linux.dax;
-          version = "0.1.0";
+        trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils;
-          src = pkgs.fetchgit {
-            url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
-            rev = "1216092974140a561850905734fc22fdacdc2cde";
-            sha256 = "0rkab2qdwyzms6nxc44jzb5grvkkbpjwwmfv2zj96cm6cm8d9pdr";
-          };
-          propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
-          checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
-        };
-        dax = pkgs.python3Packages.buildPythonPackage rec {
-          pname = "dax";
-          version = "6.7";
-          src = pkgs.fetchgit {
-            url = "https://gitlab.com/duke-artiq/dax.git";
-            rev = "v${version}";
-            sha256 = "0rgvqqiypqvxjzrsixn3h7dn93isqw5vc2wrmpkxhzvw9lh5ihm7";
-          };
-          VERSIONEER_OVERRIDE = version;
-          inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
-          doCheck = false; # tests only pass for the latest stable ARTIQ version
-          propagatedBuildInputs = [ artiq.packages.x86_64-linux.artiq artiq.inputs.sipyco.packages.x86_64-linux.sipyco ]
-            ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx sortedcontainers ]);
-          checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
-        };
         dax-applets = pkgs.python3Packages.buildPythonPackage rec {
           pname = "dax-applets";
           version = "0.0.0";
@@ -288,6 +275,7 @@
               "llvmlite"
               "llvm-tools"
               "lld"
+              "tqdm"
               "artiq-comtools"
             ];
           }
@@ -340,11 +328,17 @@
             src = flake8-artiq.src;
             dependencies = [ "flake8" ];
           }
+          {
+            name = "trap-dac-utils";
+            version = trap-dac-utils.version;
+            src = trap-dac-utils.src;
+            dependencies = trap-dac-utils.condaDependencies;
+          }
           {
             name = "dax";
             version = dax.version;
             src = dax.src;
-            dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" "sortedcontainers" ];
+            dependencies = dax.condaDependencies;
           }
           {
             name = "dax-applets";