Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-10-01 00:19:21 +00:00
committed by GitHub
272 changed files with 3598 additions and 2287 deletions
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
postgresqlBuildExtension (finalAttrs: {
pname = "omnigres";
version = "0-unstable-2025-09-15";
version = "0-unstable-2025-09-26";
src = fetchFromGitHub {
owner = "omnigres";
repo = "omnigres";
rev = "5535ce27d6c80b3e0cf891d93e3ee07af492346c";
hash = "sha256-Ha5orh/6tvaNhGWmFpC/+ZV7WcD+nqkjwf3grhKUPys=";
rev = "247383198a95d045df0d97ece5a81adffb5c08e8";
hash = "sha256-RrdtUtrs0Mh1VyMbF89qJhr2fnCVcQy2l1/85/mJ/4Y=";
};
# This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile.
@@ -13,13 +13,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
version = "2.22.0";
version = "2.22.1";
src = fetchFromGitHub {
owner = "timescale";
repo = "timescaledb";
tag = finalAttrs.version;
hash = "sha256-6VXS/vTBXlFbEtzm7FfLBtD57GI+QHStDmFv2AvUdSs=";
hash = "sha256-SEuxHbSxgTC4Uk6nnznVzUqvoZMGgF+KSMNzkYfgfpI=";
};
nativeBuildInputs = [ cmake ];
@@ -106,7 +106,7 @@ postgresqlBuildExtension (finalAttrs: {
||
# PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233
# Check after next package update.
lib.warnIf (finalAttrs.version != "2.22.0") "Is postgresql18Packages.timescaledb still broken?" (
lib.warnIf (finalAttrs.version != "2.22.1") "Is postgresql18Packages.timescaledb still broken?" (
lib.versionAtLeast postgresql.version "18"
);
};