forked from M-Labs/nix-scripts
artiq: use nixpkgs pyqtgraph
This commit is contained in:
parent
43e02c4f8f
commit
73a895b6e9
|
@ -21,7 +21,7 @@ let
|
||||||
}) {} boards;
|
}) {} boards;
|
||||||
|
|
||||||
mainPackages = rec {
|
mainPackages = rec {
|
||||||
inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 artiq-netboot misoc migen microscope jesd204b migen-axi lit outputcheck qasync;
|
inherit (pythonDeps) sipyco asyncserial pythonparser artiq-netboot misoc migen microscope jesd204b migen-axi lit outputcheck qasync;
|
||||||
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
||||||
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
||||||
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
||||||
|
|
|
@ -10,8 +10,8 @@ python3Packages.buildPythonPackage rec {
|
||||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||||
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ]
|
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ]
|
||||||
++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
|
++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
|
||||||
++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
|
++ (with pythonDeps; [ sipyco pythonparser ])
|
||||||
++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 ])
|
++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 pyqtgraph ])
|
||||||
++ [(if (lib.strings.versionAtLeast version "6.0") then pythonDeps.qasync else python3Packages.quamash)];
|
++ [(if (lib.strings.versionAtLeast version "6.0") then pythonDeps.qasync else python3Packages.quamash)];
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
|
@ -39,20 +39,6 @@ rec {
|
||||||
propagatedBuildInputs = with python3Packages; [ regex ];
|
propagatedBuildInputs = with python3Packages; [ regex ];
|
||||||
};
|
};
|
||||||
|
|
||||||
pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
|
|
||||||
pname = "pyqtgraph_qt5";
|
|
||||||
version = "0.11.0";
|
|
||||||
doCheck = false;
|
|
||||||
pythonImportsCheck = [ "pyqtgraph" ];
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "pyqtgraph";
|
|
||||||
repo = "pyqtgraph";
|
|
||||||
rev = "pyqtgraph-${version}";
|
|
||||||
sha256 = "03fvpkqdn80ni51msvyivmghw41qk4vplwdqndkvzzzlppimdjbn";
|
|
||||||
};
|
|
||||||
propagatedBuildInputs = with python3Packages; [ scipy numpy pyqt5 pyopengl ];
|
|
||||||
};
|
|
||||||
|
|
||||||
qasync = python3Packages.buildPythonPackage rec {
|
qasync = python3Packages.buildPythonPackage rec {
|
||||||
pname = "qasync";
|
pname = "qasync";
|
||||||
version = "0.10.0";
|
version = "0.10.0";
|
||||||
|
|
|
@ -208,7 +208,7 @@ let
|
||||||
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
||||||
";
|
";
|
||||||
})) drtio-systems;
|
})) drtio-systems;
|
||||||
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial pyqtgraph-qt5 artiq; };
|
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
|
||||||
in
|
in
|
||||||
artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
|
artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
|
||||||
conda-artiq-board-kasli-tester = conda-artiq-board {
|
conda-artiq-board-kasli-tester = conda-artiq-board {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, sipyco, asyncserial, pyqtgraph-qt5, artiq }:
|
{ pkgs, sipyco, asyncserial, artiq }:
|
||||||
let
|
let
|
||||||
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
||||||
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
||||||
|
@ -267,8 +267,8 @@ in
|
||||||
sha256 = "0mgjd92yifs24dg4b14vhawx5mdisbx6jqi5xf7fgkijzjp9hvs3";
|
sha256 = "0mgjd92yifs24dg4b14vhawx5mdisbx6jqi5xf7fgkijzjp9hvs3";
|
||||||
};
|
};
|
||||||
pythonOptions = {
|
pythonOptions = {
|
||||||
propagatedBuildInputs = [ artiq pyqtgraph-qt5 ]
|
propagatedBuildInputs = [ artiq ]
|
||||||
++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
|
++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]);
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
};
|
};
|
||||||
condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
|
condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
|
||||||
|
|
Loading…
Reference in New Issue