From 4099ca5139a486bd466a5f177e226d85e2121bbd Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 13 Oct 2024 20:16:48 +1100 Subject: [PATCH 1/7] postgresqlPackages.timescaledb: add kirillrdy to maintainers --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 2ef5bb3ae988..5c5b344c65e7 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -38,7 +38,7 @@ buildPostgresqlExtension rec { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md"; - maintainers = [ ]; + maintainers = [ maintainers.kirillrdy ]; platforms = postgresql.meta.platforms; license = with licenses; if enableUnfree then tsl else asl20; broken = versionOlder postgresql.version "13" || From 86706a140b966a885d63ad9b733a9f5a11133fe2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 13 Oct 2024 20:15:52 +1100 Subject: [PATCH 2/7] postgresqlPackages.timescaledb: 2.14.2 -> 2.17.2 Changes: - https://github.com/timescale/timescaledb/releases/tag/2.17.2 - https://github.com/timescale/timescaledb/releases/tag/2.17.1 - https://github.com/timescale/timescaledb/releases/tag/2.17.0 - https://github.com/timescale/timescaledb/releases/tag/2.16.1 - https://github.com/timescale/timescaledb/releases/tag/2.16.0 - https://github.com/timescale/timescaledb/releases/tag/2.15.3 - https://github.com/timescale/timescaledb/releases/tag/2.15.2 - https://github.com/timescale/timescaledb/releases/tag/2.15.1 - https://github.com/timescale/timescaledb/releases/tag/2.15.0 squash --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 5c5b344c65e7..0a16f08cbb66 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -2,7 +2,7 @@ buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.14.2"; + version = "2.17.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ openssl libkrb5 ]; @@ -11,7 +11,7 @@ buildPostgresqlExtension rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-gJViEWHtIczvIiQKuvvuwCfWJMxAYoBhCHhD75no6r0="; + hash = "sha256-gPsAebMUBuAwP6Hoi9/vrc2IFsmTbL0wQH1g6/2k2d4="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] @@ -41,11 +41,6 @@ buildPostgresqlExtension rec { maintainers = [ maintainers.kirillrdy ]; platforms = postgresql.meta.platforms; license = with licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "13" || - # timescaledb supports PostgreSQL 17 from 2.17.0 on: - # https://github.com/timescale/timescaledb/releases/tag/2.17.0 - # We can't upgrade to it, yet, because this would imply dropping support for - # PostgreSQL 13, which is a breaking change. - (versionAtLeast postgresql.version "17" && version == "2.14.2"); + broken = versionOlder postgresql.version "14"; }; } From 993b24e1a106f8d40bde29884df9323797641913 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 20 Nov 2024 06:43:59 +1100 Subject: [PATCH 3/7] postgresqlPackages.timescaledb: nixfmt --- .../sql/postgresql/ext/timescaledb.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 0a16f08cbb66..c539ff19ba94 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,11 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, nixosTests, enableUnfree ? true, buildPostgresqlExtension }: +{ + buildPostgresqlExtension, + cmake, + enableUnfree ? true, + fetchFromGitHub, + lib, + libkrb5, + nixosTests, + openssl, + postgresql, + stdenv, +}: buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.17.2"; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl libkrb5 ]; + buildInputs = [ + openssl + libkrb5 + ]; src = fetchFromGitHub { owner = "timescale"; @@ -14,7 +28,12 @@ buildPostgresqlExtension rec { hash = "sha256-gPsAebMUBuAwP6Hoi9/vrc2IFsmTbL0wQH1g6/2k2d4="; }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] + cmakeFlags = + [ + "-DSEND_TELEMETRY_DEFAULT=OFF" + "-DREGRESS_CHECKS=OFF" + "-DTAP_CHECKS=OFF" + ] ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLINTER=OFF" ]; From 1f2ee293c6699e31fe031b182d3c1fbac2275d70 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 20 Nov 2024 06:53:01 +1100 Subject: [PATCH 4/7] nixos/doc/rl-2505: mention timescaledb --- nixos/doc/manual/release-notes/rl-2505.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index b18dbef5fe7f..ca0314fadb87 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -22,6 +22,10 @@ - `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details. +- `timescaledb` requires manual upgrade steps. + After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797). + PostgreSQL 13 is no longer supported in TimescaleDB v2.16. + - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) From c273eb28b66badbfdc00d2238e26171d93f003d2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 20 Nov 2024 17:06:20 +1100 Subject: [PATCH 5/7] postgresqlPackages.timescaledb_toolkit: 1.18.0 -> 1.19.0 Release notes: https://github.com/timescale/timescaledb-toolkit/releases/tag/1.19.0 --- .../sql/postgresql/ext/timescaledb_toolkit.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index eec287ddcc10..e854dfa88ccf 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -3,24 +3,24 @@ , buildPgrxExtension , postgresql , nixosTests -, cargo-pgrx_0_10_2 +, cargo-pgrx_0_12_0_alpha_1 , nix-update-script }: -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec { +(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; }) rec { inherit postgresql; pname = "timescaledb_toolkit"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-toolkit"; rev = version; - hash = "sha256-Lm/LFBkG91GeWlJL9RBqP8W0tlhBEeGQ6kXUzzv4xRE="; + hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; - cargoHash = "sha256-LME8oftHmmiN8GU3eTBTSB6m0CE+KtDFRssL1g2Cjm8="; + cargoHash = "sha256-+uD4UU7QwNISQZ7a2kDkY/y3fQWk/K0fFcrFq4yq6RU="; buildAndTestSubdir = "extension"; passthru = { @@ -37,8 +37,5 @@ maintainers = with maintainers; [ typetetris ]; platforms = postgresql.meta.platforms; license = licenses.tsl; - # PostgreSQL 17 support issue upstream: https://github.com/timescale/timescaledb-toolkit/issues/813 - # Check after next package update. - broken = versionAtLeast postgresql.version "17" && version == "1.18.0"; }; } From 07ba29fead7c28781f82d0ca59a898ad11a10974 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 21 Nov 2024 06:32:48 +1100 Subject: [PATCH 6/7] cargo-pgrx_0_12_6: init at 0_12_6 --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 93010928ddc6..5752f9535f80 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -77,4 +77,11 @@ in hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; }; + + cargo-pgrx_0_12_6 = generic { + version = "0.12.6"; + hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; + cargoHash = "sha256-Di4UldQwAt3xVyvgQT1gUhdvYUVp7n/a72pnX45kP0w="; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee4c200056ff..26a240bf8f5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7007,6 +7007,7 @@ with pkgs; cargo-pgrx_0_11_2 cargo-pgrx_0_11_3 cargo-pgrx_0_12_0_alpha_1 + cargo-pgrx_0_12_6 ; cargo-pgrx = cargo-pgrx_0_11_2; From 7baa9da5527275296f3c5ffd2f9a84c92e6393c6 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 21 Nov 2024 06:33:38 +1100 Subject: [PATCH 7/7] postgresqlPackages.timescaledb_toolkit: switch to cargo-pgrx_0_12_6 --- pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index e854dfa88ccf..ce04690059a6 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -3,11 +3,11 @@ , buildPgrxExtension , postgresql , nixosTests -, cargo-pgrx_0_12_0_alpha_1 +, cargo-pgrx_0_12_6 , nix-update-script }: -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; }) rec { +(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) rec { inherit postgresql; pname = "timescaledb_toolkit";