|
|
|
@ -241,13 +241,13 @@ in |
|
|
|
|
condaOptions = { dependencies = [ "flake8" ]; }; |
|
|
|
|
}) // (dualPackage rec { |
|
|
|
|
name = "dax"; |
|
|
|
|
version = "6.6"; |
|
|
|
|
version = "6.7"; |
|
|
|
|
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 = "1xf1snd0hsa94r8rdl17kwc5x0ig8hx29c0blpcihbh6r0j1cg7q"; |
|
|
|
|
sha256 = "0rgvqqiypqvxjzrsixn3h7dn93isqw5vc2wrmpkxhzvw9lh5ihm7"; |
|
|
|
|
}; |
|
|
|
|
pythonOptions = { |
|
|
|
|
VERSIONEER_OVERRIDE = version; |
|
|
|
@ -263,8 +263,8 @@ in |
|
|
|
|
withManual = false; |
|
|
|
|
src = pkgs.fetchgit { |
|
|
|
|
url = "https://gitlab.com/duke-artiq/dax-applets.git"; |
|
|
|
|
rev = "3cd1aefb03208021a38fd04803f6dcff25f61e1d"; |
|
|
|
|
sha256 = "0kk745fc8dri0zs1db790zl0dja4ibz4cd2h85xq6j6ar1s6afwj"; |
|
|
|
|
rev = "0f0196b6941b0c44a33c85d8c02047ca65466463"; |
|
|
|
|
sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4"; |
|
|
|
|
}; |
|
|
|
|
pythonOptions = { |
|
|
|
|
propagatedBuildInputs = [ artiq ] |
|
|
|
|