|
101 | 101 |
|
102 | 102 | llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
|
103 | 103 | pname = "llvmlite";
|
104 |
| - version = "0.40.1"; |
| 104 | + version = "0.43.0"; |
105 | 105 | src = pkgs.fetchFromGitHub {
|
106 | 106 | owner = "numba";
|
107 | 107 | repo = "llvmlite";
|
108 | 108 | rev = "v${version}";
|
109 |
| - sha256 = "sha256-gPEda9cMEsruvBt8I2VFfsTKZaPsNDgqx2Y9n0MSc4Y="; |
| 109 | + sha256 = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; |
110 | 110 | };
|
111 |
| - nativeBuildInputs = [ pkgs.llvm_14 ]; |
| 111 | + nativeBuildInputs = [ pkgs.llvm_15 ]; |
112 | 112 | # Disable static linking
|
113 | 113 | # https://github.com/numba/llvmlite/issues/93
|
114 | 114 | postPatch = ''
|
|
117 | 117 | '';
|
118 | 118 | # Set directory containing llvm-config binary
|
119 | 119 | preConfigure = ''
|
120 |
| - export LLVM_CONFIG=${pkgs.llvm_14.dev}/bin/llvm-config |
| 120 | + export LLVM_CONFIG=${pkgs.llvm_15.dev}/bin/llvm-config |
121 | 121 | '';
|
122 | 122 | };
|
123 | 123 |
|
|
134 | 134 |
|
135 | 135 | nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
|
136 | 136 | # keep llvm_x and lld_x in sync with llvmlite
|
137 |
| - propagatedBuildInputs = [ pkgs.llvm_14 pkgs.lld_14 sipyco.packages.x86_64-linux.sipyco pythonparser llvmlite-new pkgs.qt5.qtsvg artiq-comtools.packages.x86_64-linux.artiq-comtools ] |
| 137 | + propagatedBuildInputs = [ pkgs.llvm_15 pkgs.lld_15 sipyco.packages.x86_64-linux.sipyco pythonparser llvmlite-new pkgs.qt5.qtsvg artiq-comtools.packages.x86_64-linux.artiq-comtools ] |
138 | 138 | ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
|
139 | 139 |
|
140 | 140 | dontWrapQtApps = true;
|
|
157 | 157 | "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
|
158 | 158 | ];
|
159 | 159 |
|
160 |
| - # FIXME: automatically propagate lld_14 llvm_14 dependencies |
| 160 | + # FIXME: automatically propagate lld_15 llvm_15 dependencies |
161 | 161 | # cacert is required in the check stage only, as certificates are to be
|
162 | 162 | # obtained from system elsewhere
|
163 |
| - nativeCheckInputs = with pkgs; [ lld_14 llvm_14 lit outputcheck cacert ] ++ [ libartiq-support ]; |
| 163 | + nativeCheckInputs = with pkgs; [ lld_15 llvm_15 lit outputcheck cacert ] ++ [ libartiq-support ]; |
164 | 164 | checkPhase = ''
|
165 | 165 | python -m unittest discover -v artiq.test
|
166 | 166 |
|
|
239 | 239 | nativeBuildInputs = [
|
240 | 240 | (pkgs.python3.withPackages(ps: [ migen misoc (artiq.withExperimentalFeatures experimentalFeatures) ps.packaging ]))
|
241 | 241 | rust
|
242 |
| - pkgs.llvmPackages_14.clang-unwrapped |
243 |
| - pkgs.llvm_14 |
244 |
| - pkgs.lld_14 |
| 242 | + pkgs.llvmPackages_15.clang-unwrapped |
| 243 | + pkgs.llvm_15 |
| 244 | + pkgs.lld_15 |
245 | 245 | vivado
|
246 | 246 | rustPlatform.cargoSetupHook
|
247 | 247 | ];
|
|
395 | 395 | buildInputs = [
|
396 | 396 | (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc ps.paramiko microscope ps.packaging ] ++ artiq.propagatedBuildInputs ))
|
397 | 397 | rust
|
398 |
| - pkgs.llvmPackages_14.clang-unwrapped |
399 |
| - pkgs.llvm_14 |
400 |
| - pkgs.lld_14 |
| 398 | + pkgs.llvmPackages_15.clang-unwrapped |
| 399 | + pkgs.llvm_15 |
| 400 | + pkgs.lld_15 |
401 | 401 | pkgs.git
|
402 | 402 | artiq-frontend-dev-wrappers
|
403 | 403 | # To manually run compiler tests:
|
|
425 | 425 | buildInputs = [
|
426 | 426 | (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ps.packaging ]))
|
427 | 427 | rust
|
428 |
| - pkgs.llvmPackages_14.clang-unwrapped |
429 |
| - pkgs.llvm_14 |
430 |
| - pkgs.lld_14 |
| 428 | + pkgs.llvmPackages_15.clang-unwrapped |
| 429 | + pkgs.llvm_15 |
| 430 | + pkgs.lld_15 |
431 | 431 | packages.x86_64-linux.vivado
|
432 | 432 | packages.x86_64-linux.openocd-bscanspi
|
433 | 433 | ];
|
|
460 | 460 |
|
461 | 461 | buildInputs = [
|
462 | 462 | (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ artiq ps.paramiko ]))
|
463 |
| - pkgs.llvm_14 |
464 |
| - pkgs.lld_14 |
| 463 | + pkgs.llvm_15 |
| 464 | + pkgs.lld_15 |
465 | 465 | pkgs.openssh
|
466 | 466 | packages.x86_64-linux.openocd-bscanspi # for the bscanspi bitstreams
|
467 | 467 | ];
|
|
0 commit comments