feature/dax-6.6 #75
|
@ -231,8 +231,8 @@ in
|
||||||
withManual = false;
|
withManual = false;
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
|
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
|
||||||
rev = "e64475277bdeeb7bbdc8384c90bbd70a3f15e4cd";
|
rev = "1216092974140a561850905734fc22fdacdc2cde";
|
||||||
sha256 = "0zmpm39vzi4f8jd50p569d3sgcda3alkg8xgb8jmr0m8yw1kv5hs";
|
sha256 = "0rkab2qdwyzms6nxc44jzb5grvkkbpjwwmfv2zj96cm6cm8d9pdr";
|
||||||
};
|
};
|
||||||
pythonOptions = {
|
pythonOptions = {
|
||||||
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
|
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
|
||||||
|
@ -241,30 +241,30 @@ 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";
|
||||||
withManual = false;
|
withManual = false;
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://gitlab.com/duke-artiq/dax-applets.git";
|
url = "https://gitlab.com/duke-artiq/dax-applets.git";
|
||||||
rev = "11b7e6007825e61b61ae9f5994ffd9951c21ea6f";
|
rev = "3cd1aefb03208021a38fd04803f6dcff25f61e1d";
|
||||||
sha256 = "1jzpgxbx1cfwc784in0fbsga48589cpb8cdb7lbq5w31v0wpjbm4";
|
sha256 = "0kk745fc8dri0zs1db790zl0dja4ibz4cd2h85xq6j6ar1s6afwj";
|
||||||
};
|
};
|
||||||
pythonOptions = {
|
pythonOptions = {
|
||||||
propagatedBuildInputs = [ artiq ]
|
propagatedBuildInputs = [ artiq ]
|
||||||
|
|
Loading…
Reference in New Issue