From c7ea3795b8cbfd96f70141fcedf11d2b246a0f7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jul 2024 00:00:20 +0200 Subject: [PATCH] faiss: add support for Python 3.12 --- .../libraries/science/math/faiss/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 1dfe81442788..9b7b4d268197 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -1,7 +1,7 @@ { lib , config , fetchFromGitHub -, symlinkJoin +, fetchpatch2 , stdenv , cmake , cudaPackages ? { } @@ -9,7 +9,6 @@ , pythonSupport ? true , pythonPackages , llvmPackages -, boost , blas , swig , addOpenGLRunpath @@ -55,6 +54,15 @@ stdenv.mkDerivation { hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; }; + patches = [ + (fetchpatch2 { + # Replace distutils with packaging for version checks + url = "https://github.com/facebookresearch/faiss/commit/c540e762ca0ecf8f43da0bfc215da148c5cf420e.patch"; + includes = [ "faiss/python/loader.py" ]; + hash = "sha256-yMHAXo0+oDXknSpv1fxUgil3R/WG1+vTLyxvwVR3VtE="; + }) + ]; + buildInputs = [ blas swig @@ -68,6 +76,7 @@ stdenv.mkDerivation { propagatedBuildInputs = lib.optionals pythonSupport [ pythonPackages.numpy + pythonPackages.packaging ]; nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [