1
0
Fork 0

move list of conda dependencies to artiq/conda-artiq-deps.nix

This commit is contained in:
Astro 2019-04-13 20:32:06 +02:00 committed by Sébastien Bourdeauducq
parent 2afaa9ddd3
commit 343f11b73b
3 changed files with 24 additions and 39 deletions

View File

@ -0,0 +1,19 @@
[
"python >=3.5.3,<3.6"
"llvmlite-artiq 0.23.0.dev py35_5"
"binutils-or1k-linux >=2.27"
"pythonparser >=1.1"
"openocd 0.10.0 6"
"scipy"
"numpy"
"prettytable"
"asyncserial"
"h5py 2.8"
"python-dateutil"
"pyqt >=5.5"
"quamash"
"pyqtgraph 0.10.0"
"pygit2"
"aiohttp >=3"
"levenshtein"
]

View File

@ -39,23 +39,7 @@ let
requirements: requirements:
run: run:
- python >=3.5.3,<3.6 ${lib.concatStringsSep "\n" (map (s: " - ${s}") (import ./conda-artiq-deps.nix))}
- llvmlite-artiq 0.23.0.dev py35_5
- binutils-or1k-linux >=2.27
- pythonparser >=1.1
- openocd 0.10.0 6
- scipy
- numpy
- prettytable
- asyncserial
- h5py 2.8
- python-dateutil
- pyqt >=5.5
- quamash
- pyqtgraph 0.10.0
- pygit2
- aiohttp >=3
- levenshtein
about: about:
home: https://m-labs.hk/artiq home: https://m-labs.hk/artiq

View File

@ -45,28 +45,10 @@ let
"${src}" "${sshUser}@localhost:${target}" "${src}" "${sshUser}@localhost:${target}"
''; '';
condaEnv = "artiq-env"; condaEnv = "artiq-env";
condaDependencies = [ condaDepSpecs =
"python >=3.5.3,<3.6"
"llvmlite-artiq 0.23.0.dev py35_5"
"binutils-or1k-linux >=2.27"
"pythonparser >=1.1"
"openocd 0.10.0 6"
"scipy"
"numpy"
"prettytable"
"asyncserial"
"h5py 2.8"
"python-dateutil"
"pyqt >=5.5"
"quamash"
"pyqtgraph 0.10.0"
"pygit2"
"aiohttp >=3"
"levenshtein"
];
condaPkgSpecs =
builtins.concatStringsSep " " builtins.concatStringsSep " "
(map (s: "\"${s}\"") condaDependencies); (map (s: "\"${s}\"")
(import ../conda-artiq-deps.nix));
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "windows-installer"; name = "windows-installer";
@ -127,7 +109,7 @@ stdenv.mkDerivation {
${ssh "miniconda\\Scripts\\conda update -y conda"} ${ssh "miniconda\\Scripts\\conda update -y conda"}
${ssh "miniconda\\Scripts\\conda update -y --all"} ${ssh "miniconda\\Scripts\\conda update -y --all"}
${ssh "miniconda\\Scripts\\conda create -y -n ${condaEnv}"} ${ssh "miniconda\\Scripts\\conda create -y -n ${condaEnv}"}
${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} ${condaPkgSpecs}"} ${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} ${condaDepSpecs}"}
${ssh "shutdown /p /f"} ${ssh "shutdown /p /f"}
echo "Waiting for qemu exit" echo "Waiting for qemu exit"