diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/by-name/fa/faiss/package.nix similarity index 94% rename from pkgs/development/libraries/science/math/faiss/default.nix rename to pkgs/by-name/fa/faiss/package.nix index 2f635fa7bd53..7747113259fb 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 609bd3827562..2bea3142503c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17365,10 +17365,6 @@ with pkgs; jre = openjdk17; }; - faiss = callPackage ../development/libraries/science/math/faiss { - pythonPackages = python3Packages; - }; - faissWithCuda = faiss.override { cudaSupport = true; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7375457cbb86..58eb701b3414 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; }; };