M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

artiq-full/conda-channel: fix artiq-fast path

This commit is contained in:
Astro 2021-02-15 14:18:25 +01:00
parent a6ea6e3666
commit 72fb469b0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-full.nix
View File

@ -243,5 +243,5 @@ in
src = generatedNix; src = generatedNix;
constituents = []; constituents = [];
}; };
conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; }; conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs artiq-fast; } { inherit jobs; };
} }

4
artiq-full/conda-channel.nix
View File

@ -1,8 +1,8 @@
{ pkgs }: { pkgs, artiq-fast }:
{ jobs }: { jobs }:
let let
condaBuilderEnv = import <artiq-fast/conda/builder-env.nix> { inherit pkgs; }; condaBuilderEnv = import ../artiq-fast/conda/builder-env.nix { inherit pkgs; };
in in
pkgs.runCommand "conda-channel" { } pkgs.runCommand "conda-channel" { }
'' ''