forked from M-Labs/nix-scripts
disambiguate llvmlite vs. llvmlite-artiq
This commit is contained in:
parent
3ce85ccc11
commit
b4e7b53957
|
@ -32,8 +32,8 @@ in rec {
|
|||
inherit (callPackage ./pkgs/python3Packages.nix {}) migen microscope misoc jesd204b;
|
||||
binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
|
||||
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
|
||||
llvmlite = callPackage ./pkgs/llvmlite.nix { inherit llvm-or1k; };
|
||||
artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; };
|
||||
llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
|
||||
artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite-artiq; };
|
||||
openocd = callPackage ./pkgs/openocd.nix {};
|
||||
|
||||
conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, git, fetchFromGitHub, fetchgit, python3Packages, qt5Full, binutils-or1k, llvm-or1k, llvmlite, python3 }:
|
||||
{ stdenv, git, fetchFromGitHub, fetchgit, python3Packages, qt5Full, binutils-or1k, llvm-or1k, llvmlite-artiq, python3 }:
|
||||
|
||||
let
|
||||
|
||||
|
@ -68,7 +68,7 @@ python3Packages.buildPythonPackage rec {
|
|||
version = import ./artiq-version.nix;
|
||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
||||
propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
|
||||
propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite-artiq levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
|
||||
checkPhase = "python -m unittest discover -v artiq.test";
|
||||
meta = with stdenv.lib; {
|
||||
description = "A leading-edge control system for quantum information experiments";
|
||||
|
|
|
@ -4,5 +4,5 @@ let
|
|||
artiqpkgs = import ./default.nix { inherit pkgs; };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with artiqpkgs; [ binutils-or1k llvm-or1k llvmlite artiq ];
|
||||
buildInputs = with artiqpkgs; [ binutils-or1k llvm-or1k llvmlite-artiq artiq ];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue