From fbe399529890eb555dc547d0f38e4c9ffed22d23 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 13 Oct 2022 11:56:40 -0400 Subject: [PATCH 1/9] postgresql_15: init at 15.0 https://www.postgresql.org/docs/15/release-15.html --- pkgs/servers/sql/postgresql/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 942ede627069..a5bdbc97838b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -245,4 +245,13 @@ in self: { thisAttr = "postgresql_14"; inherit self; }; + + postgresql_15 = self.callPackage generic { + version = "15.0"; + psqlSchema = "15"; + hash = "sha256-cux09KfBbmhPQ+pC4hVJf81MVdAopo+3LpnmH/QNpNY="; + this = self.postgresql_15; + thisAttr = "postgresql_15"; + inherit self; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64ee8bfe9696..8cbbb7966ae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23926,12 +23926,14 @@ with pkgs; postgresql_12 postgresql_13 postgresql_14 + postgresql_15 ; postgresql = postgresql_14.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; + postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From 972f78b6fbf75a17e192d19c20440fca24c8b01c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 2/9] postgresql15Packages.pgvector: fix build for PostgreSQL 15 --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index ddc51e8d2b73..c04cb0c3b159 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }: stdenv.mkDerivation rec { pname = "pgvector"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-kIgdr3+KC11Qxk1uBTmcN4dDaLIhfo/Fs898boESsBc="; }; + patches = [ + # Added support for Postgres 15. Remove with the next release. + (fetchpatch { + url = "https://github.com/pgvector/pgvector/commit/c9c6b96eede7d78758ca7ca5db98bf8b24021d0f.patch"; + sha256 = "sha256-hgCpGtuYmqo4Ttlpn4FBskbNdZmM1wJeMQBJZ7H923g="; + }) + ]; + buildInputs = [ postgresql ]; installPhase = '' From f0456a97b42e2d4e1f14c0b6f94107112941de98 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 3/9] postgresql15Packages.periods: 1.2 -> 1.2.1 https://github.com/xocolatl/periods/releases/tag/v1.2.1 --- pkgs/servers/sql/postgresql/ext/periods.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 4d1d3326457f..9ceabbe972a1 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "periods"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "xocolatl"; repo = pname; rev = "v${version}"; - sha256 = "13aix61qzlb7cs042dz4x0z4sc2xayg4nzi2cks46zibxm5i4gzm"; + sha256 = "sha256-XAqjP8Cih+HzqlI8XjgCNzSVQSbaetLRvJReiwHdaIc="; }; buildInputs = [ postgresql ]; From 9851053baaaf51acbfd092c42333f8792401ac7c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 13 Oct 2022 23:20:00 -0500 Subject: [PATCH 4/9] postgresql15Packages.pg_repack: 1.4.7 -> 1.4.8 --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 626e4e0290b1..83c3ac0796a7 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.7"; + version = "1.4.8"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "refs/tags/ver_${version}"; - sha256 = "12j8crgljvkm9dz790xcsr8l7sv8ydvb2imrb0jh1jvj0r9yg1v5"; + rev = "f42c1bd707bd5d69a9eb33494133db2e47a2c05a"; # no release tag + sha256 = "sha256-pZjspnmPTXS/SbyLAd7vcoF01cbC6PnxZjuto4lUuQA="; }; installPhase = '' From 97845bb25279046b60430de8784a2e9d75aeb721 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 5/9] postgresql15Packages.plpgsql_check: 2.2.1 -> 2.2.2 https://github.com/okbob/plpgsql_check/releases/tag/v2.2.2 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index a38b6a5ecba0..0650cf8a7b2a 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0x7alz0EySMcqi4yZm5z6pZeL6glf8AYHG+dVBBtnIU="; + sha256 = "sha256-Nxq4wpOWYt4oyoLxERWPhlEwWmLiDEk27EFyDtW/BfI="; }; buildInputs = [ postgresql ]; From d45bce3fe61248c130f6294df649a17db5cfd5bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 6/9] postgresql15Packages.wal2json: 2.4 -> 2.5 https://github.com/eulerto/wal2json/releases/tag/wal2json_2_5 --- pkgs/servers/sql/postgresql/ext/wal2json.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index d00e3a175328..f9e01a7bd517 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "wal2json"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; rev = "wal2json_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-EB+tCaILWsU9fDhqosl6EyMoYBd6SHISFfyxiZ9pNOk="; + sha256 = "sha256-Gpc9uDKrs/dmVSFgdgHM453+TaEnhRh9t0gDbSn8FUI="; }; buildInputs = [ postgresql ]; From 19a7affebe7e31957fa1d20301de1d3ef37bebc3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 7/9] postgresql15Packages.tsearch_extras: remove unneeded parameter --- pkgs/servers/sql/postgresql/ext/tsearch_extras.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 3f3b2aa4f143..582451b3ba44 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -11,7 +11,6 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - nativenativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; installPhase = '' From b0ea9c6db85f30bcc6a9f3cd4b14e501807a4c64 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 8/9] postgresql15Packages.pg_partman: 4.7.0 -> 4.7.1 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 561c16c96459..c95e4d8174d3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.7.0"; + version = "4.7.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Hbg3lf9XEIt5r4sYW+1r1tu6GyBgRXQxrPRWNuZPsvM="; + sha256 = "sha256-XewRIzue38aXhjU6GKEiuUyY+6ngtyQLhCl3/T6Al+A="; }; installPhase = '' From c7894e1e7395004e2eaf9456fa52f08bb48646ec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Oct 2022 04:20:00 +0000 Subject: [PATCH 9/9] postgresql15Packages.pgjwt: 2017-04-24 -> 2021-11-13 --- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index afa08a8cdce0..c0c9c3104427 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "pgjwt"; - version = "unstable-2017-04-24"; + version = "unstable-2021-11-13"; src = fetchFromGitHub { owner = "michelp"; repo = "pgjwt"; - rev = "546a2911027b716586e241be7fd4c6f1785237cd"; - sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; + rev = "9742dab1b2f297ad3811120db7b21451bca2d3c9"; + sha256 = "sha256-Hw3R9bMGDmh+dMzjmqZSy/rT4mX8cPU969OJiARFg10="; }; dontBuild = true;