faiss: move to by-name

NixOS · Jan 31, 2025 · 97ffcf9 · 97ffcf9
1 parent 1782a3c
commit 97ffcf9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/.../libraries/science/math/faiss/default.nix → pkgs/by-name/fa/faiss/package.nix b/.../libraries/science/math/faiss/default.nix → pkgs/by-name/fa/faiss/package.nix
@@ -7,7 +7,7 @@
   cudaPackages ? { },
   cudaSupport ? config.cudaSupport,
   pythonSupport ? true,
-  pythonPackages,
+  python3Packages,
   llvmPackages,
   blas,
   swig,
@@ -67,17 +67,17 @@ stdenv.mkDerivation {
       autoAddDriverRunpath
     ]
     ++ lib.optionals pythonSupport [
-      pythonPackages.python
-      pythonPackages.setuptools
-      pythonPackages.pip
+      python3Packages.python
+      python3Packages.setuptools
+      python3Packages.pip
     ];
 
   buildInputs =
     [
       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
@@ -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
@@ -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;
     };
   };