newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

disambiguate llvmlite vs. llvmlite-artiq

This commit is contained in:
Sebastien Bourdeauducq 2019-02-19 00:48:39 +08:00
parent 3ce85ccc11
commit b4e7b53957
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/default.nix
View File

@ -32,8 +32,8 @@ in rec {
inherit (callPackage ./pkgs/python3Packages.nix {}) migen microscope misoc jesd204b; inherit (callPackage ./pkgs/python3Packages.nix {}) migen microscope misoc jesd204b;
binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {}; binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; }; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
llvmlite = callPackage ./pkgs/llvmlite.nix { inherit llvm-or1k; }; llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; }; artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite-artiq; };
openocd = callPackage ./pkgs/openocd.nix {}; openocd = callPackage ./pkgs/openocd.nix {};
conda-artiq = import ./conda-artiq.nix { inherit pkgs; }; conda-artiq = import ./conda-artiq.nix { inherit pkgs; };

4
artiq/pkgs/artiq.nix
View File

@ -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 let
@ -68,7 +68,7 @@ python3Packages.buildPythonPackage rec {
version = import ./artiq-version.nix; version = import ./artiq-version.nix;
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 = 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"; checkPhase = "python -m unittest discover -v artiq.test";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A leading-edge control system for quantum information experiments"; description = "A leading-edge control system for quantum information experiments";

0
artiq/pkgs/llvmlite.nix → artiq/pkgs/llvmlite-artiq.nix
View File

2
artiq/shell.nix
View File

@ -4,5 +4,5 @@ let
artiqpkgs = import ./default.nix { inherit pkgs; }; artiqpkgs = import ./default.nix { inherit pkgs; };
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = with artiqpkgs; [ binutils-or1k llvm-or1k llvmlite artiq ]; buildInputs = with artiqpkgs; [ binutils-or1k llvm-or1k llvmlite-artiq artiq ];
} }