forked from M-Labs/artiq
nix: fixes
This commit is contained in:
parent
e48d440fd4
commit
d2e47844dd
|
@ -49,6 +49,18 @@ ml-pyserial = python35Packages.buildPythonPackage rec {
|
|||
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 {
|
||||
name = "pyqtgraph";
|
||||
src = fetchFromGitHub {
|
||||
|
@ -108,11 +120,11 @@ python35Packages.buildPythonPackage rec {
|
|||
version = "336482";
|
||||
name = "artiq-${version}";
|
||||
src = ./..;
|
||||
buildInputs = with python35Packages; [
|
||||
propagatedBuildInputs = with python35Packages; [
|
||||
llvm-or1k llvmlite sphinx-argparse levenshtein
|
||||
pyqtgraph aiohttp pygit2 pythonparser numpy
|
||||
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;
|
||||
meta = with stdenv.lib; {
|
||||
description = "";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, llvm-or1k, makeWrapper, python35, ncurses, zlib }:
|
||||
{ stdenv, fetchgit, llvm-or1k, makeWrapper, python35, ncurses, zlib, python35Packages }:
|
||||
let
|
||||
version = "0f4ebae";
|
||||
in
|
||||
|
@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
|
|||
src = fetchgit {
|
||||
url = "https://github.com/m-labs/llvmlite";
|
||||
rev = "0f4ebae43c2d2a084deb8b693e3d42a7b2c82222";
|
||||
sha256 = "0lnxxyjw2dapzqanms6jx64zxwhyrcria1yz49dzlb1306hzclj0";
|
||||
sha256 = "0n90w0x001k0zyn8zz6jxc9i78agqv15m55vz2raw1y0rfw16mfl";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper python35 ncurses zlib llvm-or1k];
|
||||
buildInputs = [ makeWrapper python35 ncurses zlib llvm-or1k python35Packages.setuptools ];
|
||||
|
||||
installPhase = ''
|
||||
LLVM_CONFIG=${llvm-or1k}/llvm_or1k/bin/llvm-config
|
||||
|
|
Loading…
Reference in New Issue