Skip to content

Commit 4a88693

Browse files
thomasfiresbourdeauducq
authored andcommitted
Update llvmlite to 0.43 and llvm to 15, as in MSYS2
Signed-off-by: Egor Savkin <[email protected]>
1 parent e9f1b9d commit 4a88693

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

flake.nix

+18-18
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@
101101

102102
llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
103103
pname = "llvmlite";
104-
version = "0.40.1";
104+
version = "0.43.0";
105105
src = pkgs.fetchFromGitHub {
106106
owner = "numba";
107107
repo = "llvmlite";
108108
rev = "v${version}";
109-
sha256 = "sha256-gPEda9cMEsruvBt8I2VFfsTKZaPsNDgqx2Y9n0MSc4Y=";
109+
sha256 = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o=";
110110
};
111-
nativeBuildInputs = [ pkgs.llvm_14 ];
111+
nativeBuildInputs = [ pkgs.llvm_15 ];
112112
# Disable static linking
113113
# https://github.com/numba/llvmlite/issues/93
114114
postPatch = ''
@@ -117,7 +117,7 @@
117117
'';
118118
# Set directory containing llvm-config binary
119119
preConfigure = ''
120-
export LLVM_CONFIG=${pkgs.llvm_14.dev}/bin/llvm-config
120+
export LLVM_CONFIG=${pkgs.llvm_15.dev}/bin/llvm-config
121121
'';
122122
};
123123

@@ -134,7 +134,7 @@
134134

135135
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
136136
# 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 ]
138138
++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
139139

140140
dontWrapQtApps = true;
@@ -157,10 +157,10 @@
157157
"--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
158158
];
159159

160-
# FIXME: automatically propagate lld_14 llvm_14 dependencies
160+
# FIXME: automatically propagate lld_15 llvm_15 dependencies
161161
# cacert is required in the check stage only, as certificates are to be
162162
# 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 ];
164164
checkPhase = ''
165165
python -m unittest discover -v artiq.test
166166
@@ -239,9 +239,9 @@
239239
nativeBuildInputs = [
240240
(pkgs.python3.withPackages(ps: [ migen misoc (artiq.withExperimentalFeatures experimentalFeatures) ps.packaging ]))
241241
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
245245
vivado
246246
rustPlatform.cargoSetupHook
247247
];
@@ -395,9 +395,9 @@
395395
buildInputs = [
396396
(pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc ps.paramiko microscope ps.packaging ] ++ artiq.propagatedBuildInputs ))
397397
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
401401
pkgs.git
402402
artiq-frontend-dev-wrappers
403403
# To manually run compiler tests:
@@ -425,9 +425,9 @@
425425
buildInputs = [
426426
(pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ps.packaging ]))
427427
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
431431
packages.x86_64-linux.vivado
432432
packages.x86_64-linux.openocd-bscanspi
433433
];
@@ -460,8 +460,8 @@
460460

461461
buildInputs = [
462462
(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
465465
pkgs.openssh
466466
packages.x86_64-linux.openocd-bscanspi # for the bscanspi bitstreams
467467
];

0 commit comments

Comments
 (0)