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) 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/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 2ef5bb3ae988..c539ff19ba94 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,20 +1,39 @@ -{ 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.14.2"; + version = "2.17.2"; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl libkrb5 ]; + buildInputs = [ + openssl + libkrb5 + ]; src = fetchFromGitHub { 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" ] + cmakeFlags = + [ + "-DSEND_TELEMETRY_DEFAULT=OFF" + "-DREGRESS_CHECKS=OFF" + "-DTAP_CHECKS=OFF" + ] ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLINTER=OFF" ]; @@ -38,14 +57,9 @@ 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" || - # 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"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index eec287ddcc10..ce04690059a6 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_6 , nix-update-script }: -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec { +(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) 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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcc26ebc111d..3ce2bde8f8cd 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;