diff --git a/flake.nix b/flake.nix index edcee7540..859a0b0b7 100644 --- a/flake.nix +++ b/flake.nix @@ -124,7 +124,7 @@ nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; # 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 ]); dontWrapQtApps = true; @@ -147,10 +147,10 @@ "--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 # 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 = '' python -m unittest discover -v artiq.test @@ -228,7 +228,7 @@ rust pkgs.cargo-xbuild pkgs.llvmPackages_11.clang-unwrapped - pkgs.llvm_11 + pkgs.llvm_14 pkgs.lld_14 vivado rustPlatform.cargoSetupHook @@ -391,7 +391,7 @@ rust pkgs.cargo-xbuild pkgs.llvmPackages_11.clang-unwrapped - pkgs.llvm_11 + pkgs.llvm_14 pkgs.lld_14 # To manually run compiler tests: pkgs.lit @@ -419,7 +419,7 @@ rust pkgs.cargo-xbuild pkgs.llvmPackages_11.clang-unwrapped - pkgs.llvm_11 + pkgs.llvm_14 pkgs.lld_14 packages.x86_64-linux.vivado packages.x86_64-linux.openocd-bscanspi @@ -453,7 +453,7 @@ buildInputs = [ (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ artiq ps.paramiko ])) - pkgs.llvm_11 + pkgs.llvm_14 pkgs.lld_14 pkgs.openssh packages.x86_64-linux.openocd-bscanspi # for the bscanspi bitstreams