forked from M-Labs/nix-scripts
artiq: use nixpkgs quamash
This commit is contained in:
parent
7ab028deb6
commit
f03d0370db
|
@ -18,7 +18,7 @@ let
|
||||||
"artiq-board-${board.target}-${board.variant}" = boardBinaries;
|
"artiq-board-${board.target}-${board.variant}" = boardBinaries;
|
||||||
}) {} boards;
|
}) {} boards;
|
||||||
mainPackages = rec {
|
mainPackages = rec {
|
||||||
inherit (pythonDeps) sipyco asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
inherit (pythonDeps) sipyco asyncserial levenshtein pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
||||||
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 {};
|
||||||
|
|
|
@ -9,8 +9,8 @@ in
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
||||||
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
|
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
|
||||||
++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ])
|
++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 pythonparser ])
|
||||||
++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
|
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial h5py pyqt5 ]);
|
||||||
checkInputs = [ binutils-or1k outputcheck ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
checkPhase =
|
checkPhase =
|
||||||
''
|
''
|
||||||
|
|
|
@ -48,18 +48,6 @@ rec {
|
||||||
propagatedBuildInputs = with python3Packages; [ regex ];
|
propagatedBuildInputs = with python3Packages; [ regex ];
|
||||||
};
|
};
|
||||||
|
|
||||||
quamash = python3Packages.buildPythonPackage rec {
|
|
||||||
name = "quamash";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "harvimt";
|
|
||||||
repo = "quamash";
|
|
||||||
rev = "e513b30f137415c5e098602fa383e45debab85e7";
|
|
||||||
sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa";
|
|
||||||
};
|
|
||||||
propagatedBuildInputs = with python3Packages; [ pyqt5 ];
|
|
||||||
doCheck = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
|
pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
|
||||||
name = "pyqtgraph_qt5-${version}";
|
name = "pyqtgraph_qt5-${version}";
|
||||||
version = "0.10.0";
|
version = "0.10.0";
|
||||||
|
|
Loading…
Reference in New Issue