M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flake: update to LLVM 14

This commit is contained in:
Sebastien Bourdeauducq 2023-08-07 18:28:44 +08:00
parent efbae51f9d
commit 9b94a09477
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@ -124,7 +124,7 @@
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
# keep llvm_x and lld_x in sync with llvmlite # keep llvm_x and lld_x in sync with llvmlite
propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_14 sipyco.packages.x86_64-linux.sipyco pythonparser pkgs.qt5.qtsvg artiq-comtools.packages.x86_64-linux.artiq-comtools ] propagatedBuildInputs = [ pkgs.llvm_14 pkgs.lld_14 sipyco.packages.x86_64-linux.sipyco pythonparser pkgs.qt5.qtsvg artiq-comtools.packages.x86_64-linux.artiq-comtools ]
++ (with pkgs.python3Packages; [ llvmlite pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]); ++ (with pkgs.python3Packages; [ llvmlite pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
dontWrapQtApps = true; dontWrapQtApps = true;
@ -147,10 +147,10 @@
"--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf" "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
]; ];
# FIXME: automatically propagate lld_14 llvm_11 dependencies # FIXME: automatically propagate lld_14 llvm_14 dependencies
# cacert is required in the check stage only, as certificates are to be # cacert is required in the check stage only, as certificates are to be
# obtained from system elsewhere # obtained from system elsewhere
nativeCheckInputs = [ pkgs.lld_14 pkgs.llvm_11 libartiq-support pkgs.lit outputcheck pkgs.cacert ]; nativeCheckInputs = [ pkgs.lld_14 pkgs.llvm_14 libartiq-support pkgs.lit outputcheck pkgs.cacert ];
checkPhase = '' checkPhase = ''
python -m unittest discover -v artiq.test python -m unittest discover -v artiq.test
@ -228,7 +228,7 @@
rust rust
pkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_11.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_14
pkgs.lld_14 pkgs.lld_14
vivado vivado
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
@ -391,7 +391,7 @@
rust rust
pkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_11.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_14
pkgs.lld_14 pkgs.lld_14
# To manually run compiler tests: # To manually run compiler tests:
pkgs.lit pkgs.lit
@ -419,7 +419,7 @@
rust rust
pkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_11.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_14
pkgs.lld_14 pkgs.lld_14
packages.x86_64-linux.vivado packages.x86_64-linux.vivado
packages.x86_64-linux.openocd-bscanspi packages.x86_64-linux.openocd-bscanspi
@ -453,7 +453,7 @@
buildInputs = [ buildInputs = [
(pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ artiq ps.paramiko ])) (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ artiq ps.paramiko ]))
pkgs.llvm_11 pkgs.llvm_14
pkgs.lld_14 pkgs.lld_14
pkgs.openssh pkgs.openssh
packages.x86_64-linux.openocd-bscanspi # for the bscanspi bitstreams packages.x86_64-linux.openocd-bscanspi # for the bscanspi bitstreams