From 5407e79111ac4117a4cb3ff543998ea5d3383c0b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 19 Apr 2019 19:49:07 +0800
Subject: [PATCH] add artiq-extras with korad controller

---
 artiq/artiq-extras.nix | 14 ++++++++++++++
 artiq/default.nix      |  9 +++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 artiq/artiq-extras.nix

diff --git a/artiq/artiq-extras.nix b/artiq/artiq-extras.nix
new file mode 100644
index 0000000..da5a529
--- /dev/null
+++ b/artiq/artiq-extras.nix
@@ -0,0 +1,14 @@
+{ pkgs, asyncserial, artiq }:
+{
+  korad_ka3005p = pkgs.python3Packages.buildPythonPackage rec {
+    version = "1.0";
+    name = "korad_ka3005p-${version}";
+    buildInputs = [ asyncserial artiq ];
+    src = pkgs.fetchFromGitHub {
+      owner = "m-labs";
+      repo = "korad_ka3005p";
+      rev = "e0adec6c577d7d1b832a2b1bf20e89ac393ca27e";
+      sha256 = "18092zgjh63qrg6lg9mzsbr2yri7k7wb97mip5xq3zrcabmmpbk3";
+    };
+  };
+}
diff --git a/artiq/default.nix b/artiq/default.nix
index e886353..43b58b7 100644
--- a/artiq/default.nix
+++ b/artiq/default.nix
@@ -22,13 +22,11 @@ let
           boardBinaries = boardBinaries;
         };
       }) {} boards;
-
   manualPackages = import ./pkgs/artiq-manual.nix {
     inherit stdenv lib fetchgit python3Packages texlive texinfo;
     inherit (pythonDeps) sphinx-argparse sphinxcontrib-wavedrom;
   };
-in
-  rec {
+  mainPackages = rec {
     inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck sphinx-argparse wavedrom sphinxcontrib-wavedrom;
     binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
     llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
@@ -43,4 +41,7 @@ in
     artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
     openocd = callPackage ./pkgs/openocd.nix {};
     conda-artiq = import ./conda-artiq.nix { inherit pkgs; };
-  } // boardPackages // manualPackages
+  } // boardPackages // manualPackages;
+  extraPackages = import ./artiq-extras.nix { inherit pkgs; inherit (mainPackages) asyncserial artiq; };
+in
+  mainPackages // extraPackages