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

artiq-extras: add newfocus8742

This commit is contained in:
Sebastien Bourdeauducq 2019-04-19 22:03:02 +08:00
parent 216a04bed2
commit b43deb1d8f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/artiq-extras.nix
View File

@ -1,7 +1,7 @@
{ pkgs, asyncserial, artiq }: { pkgs, asyncserial, artiq }:
let let
dualPackage = ( dualPackage = (
{ name, version, src, pythonOptions, condaOptions }: { name, version, src, pythonOptions ? {}, condaOptions ? {}}:
{ {
"${name}" = pkgs.python3Packages.buildPythonPackage ({ "${name}" = pkgs.python3Packages.buildPythonPackage ({
inherit version; inherit version;
@ -39,4 +39,14 @@ in
}; };
pythonOptions = { buildInputs = [ asyncserial artiq ]; }; pythonOptions = { buildInputs = [ asyncserial artiq ]; };
condaOptions = { dependencies = [ "asyncserial" ]; }; condaOptions = { dependencies = [ "asyncserial" ]; };
}) // (dualPackage {
name = "newfocus8742";
version = "0.1";
src = pkgs.fetchFromGitHub {
owner = "quartiq";
repo = "newfocus8742";
rev = "8224f69fe16e407a1e0e74d2923eca4ab707a60c";
sha256 = "0hahk2hfc9xxrxkqz8ghkh9b35hppdxdlkb55fz9z9s686caki02";
};
pythonOptions = { buildInputs = [ artiq ]; };
}) })

2
artiq/conda-fake-source.nix
View File

@ -1,5 +1,5 @@
{ pkgs }: { pkgs }:
{ name, version, src, dependencies }: { name, version, src, dependencies ? []}:
pkgs.runCommand "conda-fake-source-${name}" { } pkgs.runCommand "conda-fake-source-${name}" { }
'' ''
mkdir -p $out/fake-conda; mkdir -p $out/fake-conda;