From 1fdbaec0bbb37f3b96f0955809b8fcb1393ae3cb Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 1 Jan 2026 16:52:57 +0800 Subject: [PATCH] python3Packages.blis: 1.3.0 -> 1.3.3 --- .../python-modules/blis/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index c77191f806f3..27777bd680b9 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -21,16 +22,24 @@ buildPythonPackage rec { pname = "blis"; - version = "1.3.0"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; tag = "release-v${version}"; - hash = "sha256-mSIfFjnLhPLqSNLHMS5gTeAmqmNfXpcbyH7ejv4YgQU="; + hash = "sha256-CCy5vYjj4pCOfpKSEjdHsA6XTW7Wl3UVN8FHUsAhmVk="; }; + patches = [ + # TODO: remove after next update + (fetchpatch2 { + url = "https://github.com/explosion/cython-blis/commit/1498af063ea924e2e2334a3f5ab49ae1a66a8648.patch?full_index=1"; + hash = "sha256-zl+xIoYVjf13La53ocrL0ztx48sdJfWN1Y6px6Hgf9Q="; + }) + ]; + build-system = [ setuptools cython @@ -45,9 +54,14 @@ buildPythonPackage rec { # error: [Errno 2] No such file or directory: '/build/source/blis/_src/make/linux-cortexa57.jsonl' (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) - # clang: error: unknown argument '-mavx512pf'; did you mean '-mavx512f'? - # Patching blis/_src/config/knl/make_defs.mk to remove the said flag does not work - || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + # cc1: error: bad value ‘knl’ for ‘-march=’ switch + # https://gcc.gnu.org/gcc-15/changes.html#x86 + || ( + stdenv.hostPlatform.isLinux + && stdenv.hostPlatform.isx86_64 + && stdenv.cc.isGNU + && lib.versionAtLeast stdenv.cc.version "15" + ) ) { BLIS_ARCH = "generic";