From 4fdeae9c1150c69362b73ff5df8fe216e378365d Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 10 Aug 2025 06:53:50 +0100 Subject: [PATCH] python313Packages.llvmlite: 0.44.0 -> 0.45.0rc1 --- .../python-modules/llvmlite/default.nix | 32 ++++++++++++------- pkgs/top-level/python-packages.nix | 3 +- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index c6fd06d620c1..b81f40392fa3 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -8,17 +8,25 @@ setuptools, + cmake, + ninja, + + llvm_20, + libxml2, + # tests pytestCheckHook, - llvm, - libxml2, withStaticLLVM ? true, }: +let + llvm = llvm_20; +in + buildPythonPackage rec { pname = "llvmlite"; - version = "0.44.0"; + version = "0.45.0rc1"; pyproject = true; disabled = isPyPy || pythonAtLeast "3.14"; @@ -27,28 +35,28 @@ buildPythonPackage rec { owner = "numba"; repo = "llvmlite"; tag = "v${version}"; - hash = "sha256-ZIA/JfK9ZP00Zn6SZuPus30Xw10hn3DArHCkzBZAUV0="; + hash = "sha256-wMTNtUuslCjopyfF6FAtfJAR0zuWjL8N8G16UKiplN0="; }; build-system = [ setuptools ]; + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ]; - postPatch = lib.optionalString withStaticLLVM '' - substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all" - ''; - - # Set directory containing llvm-config binary - env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config"; - nativeCheckInputs = [ pytestCheckHook ]; + dontUseCmakeConfigure = true; + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' cd $out ''; - __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ]; + env.LLVMLITE_SHARED = !withStaticLLVM; passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40c1e29a051a..670ea92e0208 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8641,8 +8641,7 @@ self: super: with self; { llmx = callPackage ../development/python-modules/llmx { }; llvmlite = callPackage ../development/python-modules/llvmlite { - # llvmlite always requires a specific version of llvm. - llvm = pkgs.llvm_16; + inherit (pkgs) cmake ninja; }; lm-eval = callPackage ../development/python-modules/lm-eval { };