From dac849b163f22f5d1fe6587fb5fd5e9f36562648 Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Mon, 19 Aug 2024 15:30:56 +0200 Subject: [PATCH 1/2] faiss: unbreak pythonless build When `pythonSupport = false`, `dist` won't exist. --- pkgs/development/libraries/science/math/faiss/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 9d0dea3ff6a1..5d432caffa24 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -46,11 +46,7 @@ in stdenv.mkDerivation { inherit pname version; - outputs = [ - "out" - "demos" - "dist" - ]; + outputs = [ "out" "demos" ] ++ lib.optionals pythonSupport [ "dist" ]; src = fetchFromGitHub { owner = "facebookresearch"; From 2aaf216245ec8b776e8df9931632bd2be74d3bb6 Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Mon, 19 Aug 2024 16:22:06 +0200 Subject: [PATCH 2/2] nixfmt with rfc style --- pkgs/development/libraries/science/math/faiss/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 5d432caffa24..11096a193958 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -46,7 +46,10 @@ in stdenv.mkDerivation { inherit pname version; - outputs = [ "out" "demos" ] ++ lib.optionals pythonSupport [ "dist" ]; + outputs = [ + "out" + "demos" + ] ++ lib.optionals pythonSupport [ "dist" ]; src = fetchFromGitHub { owner = "facebookresearch";