From 0ef16d8a7d9f6872909e7bc0bc459e73c603b647 Mon Sep 17 00:00:00 2001
From: Leon Riesebos <leon.riesebos@duke.edu>
Date: Sat, 27 Nov 2021 15:58:14 -0500
Subject: [PATCH] extras: bumped dax version to 6.6

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

diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 6a4053a..8defe5f 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -241,22 +241,22 @@ in
     condaOptions = { dependencies = [ "flake8" ]; };
   }) // (dualPackage rec {
     name = "dax";
-    version = "6.5";
+    version = "6.6";
     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";
       rev = "v${version}";
-      sha256 = "1za7n59ya175w1y6gfx0zf4cayizz5m9gd1mf93bkycwx7pyhn4a";
+      sha256 = "1xf1snd0hsa94r8rdl17kwc5x0ig8hx29c0blpcihbh6r0j1cg7q";
     };
     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 ]);
+        ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx sortedcontainers ]);
       checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
     };
-    condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" ]; };
+    condaOptions = { dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" "sortedcontainers" ]; };
   }) // (dualPackage {
     name = "dax-applets";
     version = "0.0.0";