harry
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extras: bumped dax version to 6.6

This commit is contained in:
Leon Riesebos 2021-11-27 15:58:14 -05:00
parent 3562f6f189
commit 0ef16d8a7d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq-full/extras.nix
View File

@ -241,22 +241,22 @@ in
condaOptions = { dependencies = [ "flake8" ]; }; condaOptions = { dependencies = [ "flake8" ]; };
}) // (dualPackage rec { }) // (dualPackage rec {
name = "dax"; name = "dax";
version = "6.5"; version = "6.6";
enabled = builtins.head (builtins.splitVersion version) == builtins.head (builtins.splitVersion artiq.version); enabled = builtins.head (builtins.splitVersion version) == builtins.head (builtins.splitVersion artiq.version);
withManual = false; withManual = false;
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gitlab.com/duke-artiq/dax.git"; url = "https://gitlab.com/duke-artiq/dax.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "1za7n59ya175w1y6gfx0zf4cayizz5m9gd1mf93bkycwx7pyhn4a"; sha256 = "1xf1snd0hsa94r8rdl17kwc5x0ig8hx29c0blpcihbh6r0j1cg7q";
}; };
pythonOptions = { pythonOptions = {
VERSIONEER_OVERRIDE = version; VERSIONEER_OVERRIDE = version;
inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE; inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
propagatedBuildInputs = [ artiq sipyco ] 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 ]; 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 { }) // (dualPackage {
name = "dax-applets"; name = "dax-applets";
version = "0.0.0"; version = "0.0.0";