Unverified Commit bb9b4c7b authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

postgresqlPackages.vectorchord: 1.1.0 -> 1.1.1 (#498883)

parents 47403596 417e6ca9

nixos/tests/web-apps/immich-vectorchord-reindex.nix

+31 −17
Original line number Diff line number Diff line
@@ -17,24 +17,38 @@ 
        environment.IMMICH_LOG_LEVEL = "verbose";

      };



      services.postgresql.extensions = lib.mkForce (ps: [

        ps.pgvector

        # pin vectorchord to an older version simulate version bump

        (ps.vectorchord.overrideAttrs (prevAttrs': rec {

          version = "0.5.2";

      services.postgresql.extensions = lib.mkForce (

        ps:

        let

          # Pin vectorchord to an older version simulate version bump.

          # This version must have a different "schema" version than the latest version in nixpkgs.

          # See version number at https://github.com/tensorchord/VectorChord/blob/1.1.0/crates/vchordrq/src/tuples.rs#L23

          vectorchord =

            (ps.vectorchord.override {

              cargo-pgrx_0_17_0 = pkgs.cargo-pgrx_0_16_0;

            }).overrideAttrs

              (

                finalAttrs: _: {

                  version = "1.0.0";

                  src = pkgs.fetchFromGitHub {

                    owner = "tensorchord";

                    repo = "vectorchord";

            tag = version;

            hash = "sha256-KGwiY5t1ivFiYex3D20y3sdiu3CT9LCDd2fPnRE56jM=";

                    tag = finalAttrs.version;

                    hash = "sha256-+BOuiinbKPZZaDl9aYsIoZPgvLZ4FA6Rb4/W+lAz4so=";

                  };



                  cargoDeps = pkgs.rustPlatform.fetchCargoVendor {

            inherit src;

            hash = "sha256-Vn3c/xuUpQzERJ74I0qbvufTZtW3goefPa5B/nOUO48=";

                    inherit (finalAttrs) src;

                    hash = "sha256-kwe2x7OTjpdPonZsvnR1C/89D5W/R5JswYF79YcSFEA=";

                  };

        }))

      ]);

                }

              );

        in

        [

          ps.pgvector

          vectorchord

        ]

      );



      specialisation."immich-vectorchord-upgraded".configuration = {

        # needs to be lower than mkForce, otherwise it does not get rid of the previous version

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

+5 −0
Original line number Diff line number Diff line
@@ -23,4 +23,9 @@ 
    hash = "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=";

    cargoHash = "sha256-95DHq5GLnAqb3bbKwwaeBeKEmkfRh81ZTRaJ7L59DAg=";

  };

  cargo-pgrx_0_17_0 = {

    version = "0.17.0";

    hash = "sha256-Ld7m7ggxlf8FufpeiAE9qcu49X0SgX6XXHS6KIewGyA=";

    cargoHash = "sha256-hNj39YzJna8iZxnlrLz+uLduxaD+uvggQRM7ng3MN1k=";

  };

}

pkgs/servers/sql/postgresql/ext/vectorchord/package.nix

+5 −5
Original line number Diff line number Diff line 
{

  buildPgrxExtension,

  cargo-pgrx_0_16_0,

  cargo-pgrx_0_17_0,

  fetchFromGitHub,

  lib,

  nix-update-script,
@@ -9,19 +9,19 @@ 
}:

buildPgrxExtension (finalAttrs: {

  inherit postgresql;

  cargo-pgrx = cargo-pgrx_0_16_0;

  cargo-pgrx = cargo-pgrx_0_17_0;



  pname = "vectorchord";

  version = "1.1.0";

  version = "1.1.1";



  src = fetchFromGitHub {

    owner = "tensorchord";

    repo = "vectorchord";

    tag = finalAttrs.version;

    hash = "sha256-8Gk5/wIGu5/t8EKeG9Wna7yUWKiuCOC9yjJFo2euF/I=";

    hash = "sha256-QL9XGSQFOcrpww03Y5F0JuDbpo0v8oidUqucLxggkqE=";

  };



  cargoHash = "sha256-o7NZEH3NCf/T81kL7jDa4HHGWsyTkLXXhq4KQR2/PGM=";

  cargoHash = "sha256-IXOCzKJArNOcb/2TcJbLz1XdCquUpyF/cLHYU5vmlko=";



  # Include upgrade scripts in the final package

  # https://github.com/tensorchord/VectorChord/blob/0.5.0/crates/make/src/main.rs#L366

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -4687,6 +4687,7 @@ with pkgs; 
    cargo-pgrx_0_12_6

    cargo-pgrx_0_16_0

    cargo-pgrx_0_16_1

    cargo-pgrx_0_17_0

    cargo-pgrx

    ;