diff --git a/artiq/artiq-extras.nix b/artiq/artiq-extras.nix index 0684924..187dd10 100644 --- a/artiq/artiq-extras.nix +++ b/artiq/artiq-extras.nix @@ -1,7 +1,7 @@ { pkgs, asyncserial, artiq }: let dualPackage = ( - { name, version, src, pythonOptions, condaOptions }: + { name, version, src, pythonOptions ? {}, condaOptions ? {}}: { "${name}" = pkgs.python3Packages.buildPythonPackage ({ inherit version; @@ -39,4 +39,14 @@ in }; pythonOptions = { buildInputs = [ asyncserial artiq ]; }; condaOptions = { dependencies = [ "asyncserial" ]; }; + }) // (dualPackage { + name = "newfocus8742"; + version = "0.1"; + src = pkgs.fetchFromGitHub { + owner = "quartiq"; + repo = "newfocus8742"; + rev = "8224f69fe16e407a1e0e74d2923eca4ab707a60c"; + sha256 = "0hahk2hfc9xxrxkqz8ghkh9b35hppdxdlkb55fz9z9s686caki02"; + }; + pythonOptions = { buildInputs = [ artiq ]; }; }) diff --git a/artiq/conda-fake-source.nix b/artiq/conda-fake-source.nix index 73d1219..7250698 100644 --- a/artiq/conda-fake-source.nix +++ b/artiq/conda-fake-source.nix @@ -1,5 +1,5 @@ { pkgs }: -{ name, version, src, dependencies }: +{ name, version, src, dependencies ? []}: pkgs.runCommand "conda-fake-source-${name}" { } '' mkdir -p $out/fake-conda;