Skip to content

Commit 0154292

Browse files
committed
Merge branch 'develop' into or/ext-pg_stat_monitor-pg16-compat
2 parents 7346fc6 + 1f29227 commit 0154292

File tree

4 files changed

+198
-148
lines changed

4 files changed

+198
-148
lines changed

ansible/tasks/internal/optimizations.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@
3737
- popularity-contest
3838
- ubuntu-advantage-tools
3939
when: debpkg_mode or stage2_nix
40+
41+
- name: prefer ipv4 connection resolution
42+
become: yes
43+
replace:
44+
path: /etc/gai.conf
45+
regexp: "#precedence ::ffff:0:0/96 100"
46+
replace: "precedence ::ffff:0:0/96 100"

common-nix.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.6.1.121"
1+
postgres-version = "15.6.1.122"

nix/ext/timescaledb.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
stdenv.mkDerivation rec {
44
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
5-
version = "2.9.1";
5+
version = "2.16.1";
66

77
nativeBuildInputs = [ cmake ];
88
buildInputs = [ postgresql openssl libkrb5 ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
owner = "timescale";
1212
repo = "timescaledb";
1313
rev = version;
14-
hash = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8=";
14+
hash = "sha256-sLxWdBmih9mgiO51zLLxn9uwJVYc5JVHJjSWoADoJ+w=";
1515
};
1616

1717
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]

0 commit comments

Comments
 (0)