From df662c4262ea3d0b4cdf4d6ab3184ecbb1f3aafa Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 7 Aug 2023 23:02:23 +0800
Subject: [PATCH] flake: update llvmlite

---
 artiq/test/lit/embedding/syscall_arg_attrs.py |  4 +--
 artiq/test/lit/embedding/syscall_flags.py     |  2 +-
 flake.nix                                     | 26 +++++++++++++++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/artiq/test/lit/embedding/syscall_arg_attrs.py b/artiq/test/lit/embedding/syscall_arg_attrs.py
index 67207dc32..a20d90bed 100644
--- a/artiq/test/lit/embedding/syscall_arg_attrs.py
+++ b/artiq/test/lit/embedding/syscall_arg_attrs.py
@@ -18,13 +18,13 @@ def entrypoint():
     return_str()
 
 
-# CHECK: declare void @accept_str\({ i8\*, i32 }\* byval\)
+# CHECK: declare void @accept_str\({ i8\*, i32 }\* byval\({ i8\*, i32 }\)\)
 @syscall
 def accept_str(name: TStr) -> TNone:
     pass
 
 
-# CHECK: declare void @return_str\({ i8\*, i32 }\* sret\)
+# CHECK: declare void @return_str\({ i8\*, i32 }\* sret\({ i8\*, i32 }\)\)
 @syscall
 def return_str() -> TStr:
     pass
diff --git a/artiq/test/lit/embedding/syscall_flags.py b/artiq/test/lit/embedding/syscall_flags.py
index cc78f843b..b2e27d6a0 100644
--- a/artiq/test/lit/embedding/syscall_flags.py
+++ b/artiq/test/lit/embedding/syscall_flags.py
@@ -15,7 +15,7 @@ def foo() -> TNone:
 
 # sret nowrite functions shouldn't be marked inaccessiblememonly.
 # CHECK-L: ; Function Attrs: nounwind
-# CHECK-NEXT-L: declare void @bar({ i32, i64 }* sret)
+# CHECK-NEXT-L: declare void @bar({ i32, i64 }* sret({ i32, i64 }))
 @syscall(flags={"nounwind", "nowrite"})
 def bar() -> TTuple([TInt32, TInt64]):
     pass
diff --git a/flake.nix b/flake.nix
index d0bd6ff23..e4b4f6460 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,28 @@
         '';
       };
 
+      llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
+        pname = "llvmlite";
+        version = "0.40.1";
+        src = pkgs.fetchFromGitHub {
+            owner = "numba";
+            repo = "llvmlite";
+            rev = "v${version}";
+            sha256 = "sha256-gPEda9cMEsruvBt8I2VFfsTKZaPsNDgqx2Y9n0MSc4Y=";
+          };
+        nativeBuildInputs = [ pkgs.llvm_14 ];
+        # Disable static linking
+        # https://github.com/numba/llvmlite/issues/93
+        postPatch = ''
+          substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
+          substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
+        '';
+        # Set directory containing llvm-config binary
+        preConfigure = ''
+          export LLVM_CONFIG=${pkgs.llvm_14.dev}/bin/llvm-config
+        '';
+      };
+
       artiq-upstream = pkgs.python3Packages.buildPythonPackage rec {
         pname = "artiq";
         version = artiqVersion;
@@ -124,8 +146,8 @@
 
         nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
         # keep llvm_x and lld_x in sync with llvmlite
-        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 ]);
+        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 ]
+          ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
 
         dontWrapQtApps = true;
         postFixup = ''