Skip to content

Commit f039826

Browse files
committed
Merge branch 'develop' into or/ext-pgmq
2 parents b73d7df + c00fd90 commit f039826

File tree

6 files changed

+5159
-5103
lines changed

6 files changed

+5159
-5103
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.123"
1+
postgres-version = "15.6.1.124"

nix/ext/pg_stat_monitor.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,22 @@ let
1717
in
1818
stdenv.mkDerivation rec {
1919
pname = "pg_stat_monitor";
20-
version = "1.1.1";
20+
version = "2.1.0";
2121

2222
buildInputs = [ postgresql ];
2323

2424
src = fetchFromGitHub {
2525
owner = "percona";
2626
repo = pname;
2727
rev = "refs/tags/${version}";
28-
hash = "sha256-S4N4Xnbkz57ue6f/eGjuRi64xT0NXjpMJiNNZnbbvbU=";
28+
hash = "sha256-STJVvvrLVLe1JevNu6u6EftzAWv+X+J8lu66su7Or2s=";
2929
};
3030

3131
makeFlags = [ "USE_PGXS=1" ];
3232

3333
installPhase = ''
3434
mkdir -p $out/{lib,share/postgresql/extension}
3535
36-
cp pg_stat_monitor--1.0.15.sql.in pg_stat_monitor--1.0.sql
37-
3836
cp *.so $out/lib
3937
cp *.sql $out/share/postgresql/extension
4038
cp *.control $out/share/postgresql/extension

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)