Unverified Commit da5ae1bd authored by Diogo Correia's avatar Diogo Correia
Browse files

postgresqlPackages.pgvecto-rs: 0.2.1 -> 0.3.0

parent 9d3d0e66

pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix

+3 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
# dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.

# if you include the generated code in the output via postInstall.

, useFakeRustfmt ? true

, usePgTestCheckFeature ? true

, ...

} @ args:

let
@@ -96,7 +97,7 @@ let 
    pg_ctl stop

  '';



  argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ];

  argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" "usePgTestCheckFeature" ];



  # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because

  # we forgot parentheses
@@ -154,7 +155,7 @@ let 
    RUST_BACKTRACE = "full";



    checkNoDefaultFeatures = true;

    checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgrxPostgresMajor}" ];

    checkFeatures = (args.checkFeatures or [ ]) ++ (lib.optionals usePgTestCheckFeature [ "pg_test" ]) ++ [ "pg${pgrxPostgresMajor}" ];

  };

in

rustPlatform.buildRustPackage finalArgs

pkgs/development/tools/rust/cargo-pgrx/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -71,4 +71,10 @@ in 
    hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU=";

    cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw=";

  };



  cargo-pgrx_0_12_0_alpha_1 = generic {

    version = "0.12.0-alpha.1";

    hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws=";

    cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk=";

  };

}

pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff

+4 −4
Original line number Diff line number Diff line
@@ -4,16 +4,16 @@ index 8d822e5..8b7e371 100644 
+++ b/crates/c/build.rs

@@ -1,9 +1,13 @@

 fn main() {

     println!("cargo:rerun-if-changed=src/c.h");

     println!("cargo:rerun-if-changed=src/c.c");

     println!("cargo:rerun-if-changed=src/f16.h");

     println!("cargo:rerun-if-changed=src/f16.c");

+    println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS");

     cc::Build::new()

-        .compiler("clang-16")

+        .compiler("@clang@")

         .file("./src/c.c")

         .file("./src/f16.c")

+        // read env var set by rustPlatform.bindgenHook

+        .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS")

+        .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8")

         .opt_level(3)

         .debug(true)

         .compile("pgvectorsc");
 
         .compile("vectorsc");

pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
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

pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock

+958 −1211

File changed.

Preview size limit exceeded, changes collapsed.