From 89880b6fcc10881da1b8270b10144c84402f50b6 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 12 Aug 2022 09:32:22 +0800 Subject: [PATCH] Revert "dax: bump version, add new dependency" This reverts commit 521b5ef7b7599c7d77a5fbfa0c4a75a30915f301. --- flake.nix | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 66d4a18..640d198 100644 --- a/flake.nix +++ b/flake.nix @@ -218,25 +218,18 @@ propagatedBuildInputs = [ pkgs.python3Packages.flake8 ]; 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 { pname = "dax"; - version = "6.10"; + version = "6.7"; src = pkgs.fetchgit { url = "https://gitlab.com/duke-artiq/dax.git"; - rev = "14de370cc6689458394799624585c285a6734c87"; - sha256 = "ae0dcab7c1de40159142a8b96a2d1c198e2deddc498f74ce12361e2fff94953c"; + rev = "v${version}"; + sha256 = "0rgvqqiypqvxjzrsixn3h7dn93isqw5vc2wrmpkxhzvw9lh5ihm7"; }; VERSIONEER_OVERRIDE = version; inherit (pkgs.python3Packages.pygit2) SSL_CERT_FILE; 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 ]); checkInputs = [ pkgs.python3Packages.pytestCheckHook ]; }; @@ -349,17 +342,11 @@ src = flake8-artiq.src; dependencies = [ "flake8" ]; } - { - name = "trap-dac-utils"; - version = trap-dac-utils.version; - src = trap-dac-utils.src; - dependencies = [ "python>=3.7" "natsort" "frozendict" ]; - } { name = "dax"; version = dax.version; 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";