forked from M-Labs/nix-scripts
artiq-full/conda-channel: fix artiq-fast path
This commit is contained in:
parent
a6ea6e3666
commit
72fb469b0b
|
@ -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; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -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" { }
|
||||||
''
|
''
|
||||||
|
|
Loading…
Reference in New Issue