Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

postgresqlPackages.pgvecto-rs: fix build failure on rust 1.78 #320302

Merged
merged 1 commit into from
Jun 23, 2024
Merged

postgresqlPackages.pgvecto-rs: fix build failure on rust 1.78 #320302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/Cargo.lock b/Cargo.lock
index a52b978..092bc1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2788,7 +2788,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "std_detect"
version = "0.1.5"
-source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada"
+source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f"
dependencies = [
"cfg-if",
"libc",
diff --git a/crates/detect/Cargo.toml b/crates/detect/Cargo.toml
index b3ac782..c671c6a 100644
--- a/crates/detect/Cargo.toml
+++ b/crates/detect/Cargo.toml
@@ -4,6 +4,6 @@ version.workspace = true
edition.workspace = true

[dependencies]
-std_detect = { git = "https://github.com/tensorchord/stdarch.git", branch = "avx512fp16" }
+std_detect = { git = "https://github.com/rust-lang/stdarch.git", branch = "master" }
ctor = "0.2.6"
rustix.workspace = true
2 changes: 1 addition & 1 deletion pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ in
src = ./0001-read-clang-flags-from-environment.diff;
clang = lib.getExe clang;
})
# Fix build failure on rustc 1.78 due to missing feature flag.
# Can (likely) be removed when pgvecto-rs 0.3.0 is released.
# See https://github.com/NixOS/nixpkgs/issues/320131
./0002-std-detect-use-upstream.diff
];

src = fetchFromGitHub {
Expand All @@ -59,7 +63,7 @@ in
lockFile = ./Cargo.lock;
outputHashes = {
"openai_api_rust-0.1.8" = "sha256-os5Y8KIWXJEYEcNzzT57wFPpEXdZ2Uy9W3j5+hJhhR4=";
"std_detect-0.1.5" = "sha256-RwWejfqyGOaeU9zWM4fbb/hiO1wMpxYPKEjLO0rtRmU=";
"std_detect-0.1.5" = "sha256-Rsy8N0pTJ/3AIHjRyeOeyY7Q9Ho46ZcDmJFurCbRxiQ=";
};
};

Expand Down