esavkin/artiq-extrapkg
1
0
Fork 0
forked from M-Labs/artiq-extrapkg
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "dax: bump version, add new dependency"

Browse Source 
This reverts commit 6bc2eea14d.
This commit is contained in:
Sebastien Bourdeauducq 2022-08-12 09:34:18 +08:00
parent 6bc2eea14d
commit d104a15479
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.nix
View File

@ -218,25 +218,18 @@
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ]; propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
checkInputs = [ pkgs.python3Packages.pytestCheckHook ]; checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
}; };
trap-dac-utils = pkgs.callPackage (import (
pkgs.fetchgit {
url = "https://gitlab.com/duke-artiq/trap-dac-utils.git";
rev = "24656a246aec887ce50bdc992d812e6c0802a06b";
sha256 = "c4330c5321cb558810ad16571639c4fc972f965896e31674c197f15e31d0bf39";
}
)) { inherit pkgs; };
dax = pkgs.python3Packages.buildPythonPackage rec { dax = pkgs.python3Packages.buildPythonPackage rec {
pname = "dax"; pname = "dax";
version = "6.10"; version = "6.7";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gitlab.com/duke-artiq/dax.git"; url = "https://gitlab.com/duke-artiq/dax.git";
rev = "14de370cc6689458394799624585c285a6734c87"; rev = "v${version}";
sha256 = "ae0dcab7c1de40159142a8b96a2d1c198e2deddc498f74ce12361e2fff94953c"; sha256 = "0rgvqqiypqvxjzrsixn3h7dn93isqw5vc2wrmpkxhzvw9lh5ihm7";
}; };
VERSIONEER_OVERRIDE = version; VERSIONEER_OVERRIDE = version;
inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE; inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE;
doCheck = false; # tests only pass for the latest stable ARTIQ version doCheck = false; # tests only pass for the latest stable ARTIQ version
propagatedBuildInputs = [ trap-dac-utils artiq.packages.x86_64-linux.artiq artiq.inputs.sipyco.packages.x86_64-linux.sipyco ] 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 ]); ++ (with pkgs.python3Packages; [ numpy scipy pyvcd natsort pygit2 matplotlib graphviz h5py networkx sortedcontainers ]);
checkInputs = [ pkgs.python3Packages.pytestCheckHook ]; checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
}; };
@ -349,17 +342,11 @@
src = flake8-artiq.src; src = flake8-artiq.src;
dependencies = [ "flake8" ]; dependencies = [ "flake8" ];
} }
{
name = "trap-dac-utils";
version = trap-dac-utils.version;
src = trap-dac-utils.src;
dependencies = [ "python>=3.7" "natsort" "frozendict" ];
}
{ {
name = "dax"; name = "dax";
version = dax.version; version = dax.version;
src = dax.src; src = dax.src;
dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" "sortedcontainers" "trap-dac-utils" ]; dependencies = [ "python>=3.7" "artiq" "sipyco" "numpy" "scipy" "pyvcd" "natsort" "pygit2" "matplotlib" "python-graphviz" "h5py" "networkx" "sortedcontainers" ];
} }
{ {
name = "dax-applets"; name = "dax-applets";