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

conda: add lld dependency for ARTIQ-7

This commit is contained in:
Sebastien Bourdeauducq 2021-09-13 07:48:28 +08:00
parent 8d4ffe3a77
commit c706b6e0f4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq-fast/conda/artiq.nix
View File

@ -7,8 +7,6 @@ let
inherit version; inherit version;
src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; }; src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
dependencies = [ dependencies = [
(if (pkgs.lib.strings.versionAtLeast version "7.0") then "llvmlite" else "llvmlite-artiq")
(if (pkgs.lib.strings.versionAtLeast version "7.0") then "llvm-tools" else "binutils-or1k-linux")
"pythonparser" "pythonparser"
"scipy" "scipy"
"numpy" "numpy"
@ -21,7 +19,7 @@ let
"pygit2" "pygit2"
"python-levenshtein" "python-levenshtein"
"sipyco" "sipyco"
]; ] ++ (if (pkgs.lib.strings.versionAtLeast version "7.0") then ["llvmlite" "llvm-tools" "lld"] else ["llvmlite-artiq" "binutils-or1k-linux"]);
extraYaml = extraYaml =
'' ''
about: about: