M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

nix: fixes

This commit is contained in:
Sebastien Bourdeauducq 2018-08-12 21:20:02 +08:00
parent e48d440fd4
commit d2e47844dd
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix/artiq.nix
View File

@ -49,6 +49,18 @@ ml-pyserial = python35Packages.buildPythonPackage rec {
doCheck = false; doCheck = false;
}; };
asyncserial = python35Packages.buildPythonPackage rec {
name = "asyncserial";
src = fetchFromGitHub {
owner = "m-labs";
repo = "asyncserial";
rev = "d95bc1d6c791b0e9785935d2f62f628eb5cdf98d";
sha256 = "0yzkka9jk3612v8gx748x6ziwykq5lr7zmr9wzkcls0v2yilqx9k";
};
buildInputs = with python35Packages; [ ml-pyserial ];
doCheck = false;
};
pyqtgraph = python35Packages.buildPythonPackage rec { pyqtgraph = python35Packages.buildPythonPackage rec {
name = "pyqtgraph"; name = "pyqtgraph";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -108,11 +120,11 @@ python35Packages.buildPythonPackage rec {
version = "336482"; version = "336482";
name = "artiq-${version}"; name = "artiq-${version}";
src = ./..; src = ./..;
buildInputs = with python35Packages; [ propagatedBuildInputs = with python35Packages; [
llvm-or1k llvmlite sphinx-argparse levenshtein llvm-or1k llvmlite sphinx-argparse levenshtein
pyqtgraph aiohttp pygit2 pythonparser numpy pyqtgraph aiohttp pygit2 pythonparser numpy
dateutil sphinx quamash scipy outputcheck dateutil sphinx quamash scipy outputcheck
prettytable lit ml-pyserial h5py cython regex qt5Full pyqt5 ]; prettytable lit ml-pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = ""; description = "";

6
nix/llvmlite.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, llvm-or1k, makeWrapper, python35, ncurses, zlib }: { stdenv, fetchgit, llvm-or1k, makeWrapper, python35, ncurses, zlib, python35Packages }:
let let
version = "0f4ebae"; version = "0f4ebae";
in in
@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://github.com/m-labs/llvmlite"; url = "https://github.com/m-labs/llvmlite";
rev = "0f4ebae43c2d2a084deb8b693e3d42a7b2c82222"; rev = "0f4ebae43c2d2a084deb8b693e3d42a7b2c82222";
sha256 = "0lnxxyjw2dapzqanms6jx64zxwhyrcria1yz49dzlb1306hzclj0"; sha256 = "0n90w0x001k0zyn8zz6jxc9i78agqv15m55vz2raw1y0rfw16mfl";
leaveDotGit = true; leaveDotGit = true;
}; };
buildInputs = [ makeWrapper python35 ncurses zlib llvm-or1k]; buildInputs = [ makeWrapper python35 ncurses zlib llvm-or1k python35Packages.setuptools ];
installPhase = '' installPhase = ''
LLVM_CONFIG=${llvm-or1k}/llvm_or1k/bin/llvm-config LLVM_CONFIG=${llvm-or1k}/llvm_or1k/bin/llvm-config