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

artiq-full: fix conda paths

pull/30/head
Sebastien Bourdeauducq 2020-06-09 16:11:08 +08:00
parent 37e70bbda1
commit ffaa3f74ec
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/conda-artiq-board.nix
View File

@ -40,7 +40,7 @@ let
EOF EOF
chmod 755 $out/fake-conda/build.sh chmod 755 $out/fake-conda/build.sh
''; '';
conda-artiq-board = import ./fast/conda-build.nix { inherit pkgs; } { conda-artiq-board = import ./fast/conda/build.nix { inherit pkgs; } {
name = "conda-artiq-board-${target}-${variant}"; name = "conda-artiq-board-${target}-${variant}";
src = fakeCondaSource; src = fakeCondaSource;
}; };

4
artiq-full/extras.nix
View File

@ -1,7 +1,7 @@
{ pkgs, sipyco, asyncserial, artiq }: { pkgs, sipyco, asyncserial, artiq }:
let let
condaBuild = import ./fast/conda-build.nix { inherit pkgs; }; condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
condaFakeSource = import ./fast/conda-fake-source.nix { inherit pkgs; }; condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
dualPackage = ( dualPackage = (
{ name, version, src, pythonOptions ? {}, condaOptions ? {}}: { name, version, src, pythonOptions ? {}, condaOptions ? {}}:
{ {