From d2e47844dddf90b8661492898605507adee2fde7 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 12 Aug 2018 21:20:02 +0800
Subject: [PATCH] nix: fixes

---
 nix/artiq.nix    | 16 ++++++++++++++--
 nix/llvmlite.nix |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/nix/artiq.nix b/nix/artiq.nix
index af5c20737..5be35279e 100644
--- a/nix/artiq.nix
+++ b/nix/artiq.nix
@@ -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 = "";
diff --git a/nix/llvmlite.nix b/nix/llvmlite.nix
index 4fd99a482..762c09cf7 100644
--- a/nix/llvmlite.nix
+++ b/nix/llvmlite.nix
@@ -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