Unverified Commit e34f2c09 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: postgresql_17: init at 17.0 (#351253)

parents d36c40c3 29225a31

pkgs/servers/sql/postgresql/17.nix

0 → 100644
+6 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "17.0";

  hash = "sha256-fidhMcD91rYliNutmzuyS4w0mNUAkyjbpZrxboGRCd4=";

  # TODO: Add dont-use-locale-a-on-musl.patch once Alpine Linux has PostgreSQL 17.

  # MR in: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72853

}

pkgs/servers/sql/postgresql/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ let 
    postgresql_14 = ./14.nix;

    postgresql_15 = ./15.nix;

    postgresql_16 = ./16.nix;

    postgresql_17 = ./17.nix;

  };



  mkAttributes = jitSupport:

pkgs/servers/sql/postgresql/ext/age.nix

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


let

  hashes = {

    # Issue tracking PostgreSQL 17 support: https://github.com/apache/age/issues/2111

    # "17" = "";

    "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw=";

    "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";

    "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";

pkgs/servers/sql/postgresql/ext/citus.nix

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ stdenv.mkDerivation rec { 
    # "Our soft policy for Postgres version compatibility is to support Citus'

    # latest release with Postgres' 3 latest releases."

    # https://www.citusdata.com/updates/v12-0/#deprecated_features

    broken = versionOlder postgresql.version "14";

    broken = versionOlder postgresql.version "14" ||

      # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708

      # Check after next package update.

      (versionAtLeast postgresql.version "17" && version == "12.1.2");

    description = "Distributed PostgreSQL as an extension";

    homepage = "https://www.citusdata.com/";

    changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";

pkgs/servers/sql/postgresql/ext/lantern.nix

+9 −2
Original line number Diff line number Diff line
@@ -2,27 +2,33 @@ 
, stdenv

, cmake

, fetchFromGitHub

, openssl

, postgresql

, postgresqlTestHook

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "postgresql-lantern";

  version = "0.2.4";

  version = "0.4.1";



  src = fetchFromGitHub {

    owner = "lanterndata";

    repo = "lantern";

    rev = "v${finalAttrs.version}";

    hash = "sha256-d5CdS11Z0u8+oPvjH6gVx6k8y05SS6wU3PnafcEgQeY=";

    hash = "sha256-V8W61hELXeaVvNZgRUcckFlCMWis7NENlRKySxsK/L8=";

    fetchSubmodules = true;

  };



  postPatch = ''

    patchShebangs --build lantern_hnsw/scripts/link_llvm_objects.sh

   '';



  nativeBuildInputs = [

    cmake

  ];



  buildInputs = [

    openssl

    postgresql

  ];
@@ -38,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 


  cmakeFlags = [

    "-DBUILD_FOR_DISTRIBUTING=ON"

    "-S ../lantern_hnsw"

  ];



  passthru.tests.extension = stdenv.mkDerivation {