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

windows: fix nix escaping and conda env name

This commit is contained in:
Sebastien Bourdeauducq 2019-04-18 14:51:18 +08:00
parent d537a96207
commit 8e10afac96
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/windows/default.nix
View File

@ -17,7 +17,7 @@ let
# Double-escape because we produce a script from a shell heredoc # Double-escape because we produce a script from a shell heredoc
ssh = cmd: qemu.ssh (escape cmd); ssh = cmd: qemu.ssh (escape cmd);
scp = qemu.scp; scp = qemu.scp;
condaEnv = "artiq"; condaEnv = "artiq-env";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -35,7 +35,7 @@ stdenv.mkDerivation {
"-boot" "order=c" "-boot" "order=c"
"-snapshot" "-snapshot"
"-drive" "file=${diskImage},index=0,media=disk,cache=unsafe" "-drive" "file=${diskImage},index=0,media=disk,cache=unsafe"
"-rtc" "base=$CLOCK" "-rtc" "base=\\$CLOCK"
"-display" "none" "-display" "none"
]} & ]} &
@ -43,7 +43,7 @@ stdenv.mkDerivation {
sleep 10 sleep 10
${ssh "ver"} ${ssh "ver"}
for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do
${scp "\$pkg" "artiq.tar.bz2"} ${scp "\\$pkg" "artiq.tar.bz2"}
${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"} ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"}
done done