From b4e7b53957f1b65770988c77292888fc00297a3a Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 19 Feb 2019 00:48:39 +0800
Subject: [PATCH] disambiguate llvmlite vs. llvmlite-artiq

---
 artiq/default.nix                               | 4 ++--
 artiq/pkgs/artiq.nix                            | 4 ++--
 artiq/pkgs/{llvmlite.nix => llvmlite-artiq.nix} | 0
 artiq/shell.nix                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename artiq/pkgs/{llvmlite.nix => llvmlite-artiq.nix} (100%)

diff --git a/artiq/default.nix b/artiq/default.nix
index d78f05b..7d8ffaa 100644
--- a/artiq/default.nix
+++ b/artiq/default.nix
@@ -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; };
diff --git a/artiq/pkgs/artiq.nix b/artiq/pkgs/artiq.nix
index 506da92..af0b1d7 100644
--- a/artiq/pkgs/artiq.nix
+++ b/artiq/pkgs/artiq.nix
@@ -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";
diff --git a/artiq/pkgs/llvmlite.nix b/artiq/pkgs/llvmlite-artiq.nix
similarity index 100%
rename from artiq/pkgs/llvmlite.nix
rename to artiq/pkgs/llvmlite-artiq.nix
diff --git a/artiq/shell.nix b/artiq/shell.nix
index b35d707..edf5ade 100644
--- a/artiq/shell.nix
+++ b/artiq/shell.nix
@@ -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 ];
   }