From 59af28d6f7af07f2184465e2e6c6f2ace99b4d1c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 4 Jan 2022 22:11:10 +0800 Subject: [PATCH] flake: use LLVM 13 for consistency with NAC3 --- flake.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index b18762545..438eec67e 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; # 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 ]); dontWrapQtApps = true; @@ -93,8 +93,8 @@ "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf" ]; - # FIXME: automatically propagate lld_12 llvm_12 dependencies - checkInputs = [ pkgs.lld_12 pkgs.llvm_12 ]; + # FIXME: automatically propagate lld_13 llvm_13 dependencies + checkInputs = [ pkgs.lld_13 pkgs.llvm_13 ]; checkPhase = '' python -m unittest discover -v artiq.test ''; @@ -189,9 +189,9 @@ (pkgs.python3.withPackages(ps: [ migen misoc artiq ])) rustPlatform.rust.rustc rustPlatform.rust.cargo - pkgs.llvmPackages_12.clang-unwrapped - pkgs.llvm_12 - pkgs.lld_12 + pkgs.llvmPackages_13.clang-unwrapped + pkgs.llvm_13 + pkgs.lld_13 vivado rustPlatform.cargoSetupHook cargo-xbuild @@ -307,9 +307,9 @@ rustPlatform.rust.rustc rustPlatform.rust.cargo cargo-xbuild - pkgs.llvmPackages_12.clang-unwrapped - pkgs.llvm_12 - pkgs.lld_12 + pkgs.llvmPackages_13.clang-unwrapped + pkgs.llvm_13 + pkgs.lld_13 # 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.vivado