mwojcik
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add artiq-extras with korad controller

This commit is contained in:
Sebastien Bourdeauducq 2019-04-19 19:49:07 +08:00
parent 9accbc95e5
commit 5407e79111
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/artiq-extras.nix Normal file
View File

@ -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";
};
};
}

9
artiq/default.nix
View File

@ -22,13 +22,11 @@ let
boardBinaries = boardBinaries; boardBinaries = boardBinaries;
}; };
}) {} boards; }) {} boards;
manualPackages = import ./pkgs/artiq-manual.nix { manualPackages = import ./pkgs/artiq-manual.nix {
inherit stdenv lib fetchgit python3Packages texlive texinfo; inherit stdenv lib fetchgit python3Packages texlive texinfo;
inherit (pythonDeps) sphinx-argparse sphinxcontrib-wavedrom; inherit (pythonDeps) sphinx-argparse sphinxcontrib-wavedrom;
}; };
in mainPackages = rec {
rec {
inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck sphinx-argparse wavedrom sphinxcontrib-wavedrom; 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 {}; binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
llvm-or1k = callPackage ./pkgs/llvm-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}"; }); artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
openocd = callPackage ./pkgs/openocd.nix {}; openocd = callPackage ./pkgs/openocd.nix {};
conda-artiq = import ./conda-artiq.nix { inherit pkgs; }; 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