faiss: move to by-name

This commit is contained in:
Gaetan Lepage
2025-01-31 11:02:06 +01:00
parent 1782a3c7ff
commit 97ffcf946a
3 changed files with 6 additions and 10 deletions
@@ -7,7 +7,7 @@
cudaPackages ? { },
cudaSupport ? config.cudaSupport,
pythonSupport ? true,
pythonPackages,
python3Packages,
llvmPackages,
blas,
swig,
@@ -67,9 +67,9 @@ stdenv.mkDerivation {
autoAddDriverRunpath
]
++ lib.optionals pythonSupport [
pythonPackages.python
pythonPackages.setuptools
pythonPackages.pip
python3Packages.python
python3Packages.setuptools
python3Packages.pip
];
buildInputs =
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
blas
swig
]
++ lib.optionals pythonSupport [ pythonPackages.numpy ]
++ lib.optionals pythonSupport [ python3Packages.numpy ]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
++ lib.optionals cudaSupport cudaComponents;
-4
View File
@@ -17365,10 +17365,6 @@ with pkgs;
jre = openjdk17;
};
faiss = callPackage ../development/libraries/science/math/faiss {
pythonPackages = python3Packages;
};
faissWithCuda = faiss.override {
cudaSupport = true;
};
+1 -1
View File
@@ -4448,7 +4448,7 @@ self: super: with self; {
faiss = callPackage ../development/python-modules/faiss {
faiss-build = pkgs.faiss.override {
pythonSupport = true;
pythonPackages = self;
python3Packages = self;
};
};