MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #327752 from mweinelt/faiss-3.12

Browse source 
faiss: add support for Python 3.12
This commit is contained in:
Martin Weinelt 2024-07-17 01:54:42 +02:00 committed by GitHub
commit 73ff0bcbd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/science/math/faiss/default.nix
View file

@ -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 [