occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

flake: use LLVM 13 for consistency with NAC3

This commit is contained in:
Sebastien Bourdeauducq 2022-01-04 22:11:10 +08:00
parent 17d217d47d
commit 59af28d6f7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.nix
View File

@ -76,7 +76,7 @@
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
# keep llvm_x and lld_x in sync with nac3 # keep llvm_x and lld_x in sync with nac3
propagatedBuildInputs = [ pkgs.llvm_12 pkgs.lld_12 src-nac3.packages.x86_64-linux.nac3artiq sipyco ] propagatedBuildInputs = [ pkgs.llvm_13 pkgs.lld_13 src-nac3.packages.x86_64-linux.nac3artiq sipyco ]
++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 qasync ]); ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 qasync ]);
dontWrapQtApps = true; dontWrapQtApps = true;
@ -93,8 +93,8 @@
"--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf" "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
]; ];
# FIXME: automatically propagate lld_12 llvm_12 dependencies # FIXME: automatically propagate lld_13 llvm_13 dependencies
checkInputs = [ pkgs.lld_12 pkgs.llvm_12 ]; checkInputs = [ pkgs.lld_13 pkgs.llvm_13 ];
checkPhase = '' checkPhase = ''
python -m unittest discover -v artiq.test python -m unittest discover -v artiq.test
''; '';
@ -189,9 +189,9 @@
(pkgs.python3.withPackages(ps: [ migen misoc artiq ])) (pkgs.python3.withPackages(ps: [ migen misoc artiq ]))
rustPlatform.rust.rustc rustPlatform.rust.rustc
rustPlatform.rust.cargo rustPlatform.rust.cargo
pkgs.llvmPackages_12.clang-unwrapped pkgs.llvmPackages_13.clang-unwrapped
pkgs.llvm_12 pkgs.llvm_13
pkgs.lld_12 pkgs.lld_13
vivado vivado
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
cargo-xbuild cargo-xbuild
@ -307,9 +307,9 @@
rustPlatform.rust.rustc rustPlatform.rust.rustc
rustPlatform.rust.cargo rustPlatform.rust.cargo
cargo-xbuild cargo-xbuild
pkgs.llvmPackages_12.clang-unwrapped pkgs.llvmPackages_13.clang-unwrapped
pkgs.llvm_12 pkgs.llvm_13
pkgs.lld_12 pkgs.lld_13
# use the vivado-env command to enter a FHS shell that lets you run the Vivado installer # use the vivado-env command to enter a FHS shell that lets you run the Vivado installer
packages.x86_64-linux.vivadoEnv packages.x86_64-linux.vivadoEnv
packages.x86_64-linux.vivado packages.x86_64-linux.vivado