Skip to content

Commit 93022d6

Browse files
committed
Merge branch 'develop' of github.com:supabase/postgres into INDATA-152
* 'develop' of github.com:supabase/postgres: feat(Nix-flakes): Add pgBackRest flake (#1859) fix: wrappers 0.5.3 missing (#1872)
2 parents ae317f4 + a354427 commit 93022d6

File tree

5 files changed

+32
-3
lines changed

5 files changed

+32
-3
lines changed

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.5.1.050-orioledb"
14-
postgres17: "17.6.1.029"
15-
postgres15: "15.14.1.029"
13+
postgresorioledb-17: "17.5.1.051-orioledb"
14+
postgres17: "17.6.1.030"
15+
postgres15: "15.14.1.030"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.19.0

flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
git-hooks.url = "github:cachix/git-hooks.nix";
2020
git-hooks.inputs.nixpkgs.follows = "nixpkgs";
2121
nixpkgs-go124.url = "github:Nixos/nixpkgs/d2ac4dfa61fba987a84a0a81555da57ae0b9a2b0";
22+
nixpkgs-pgbackrest.url = "github:nixos/nixpkgs/nixos-unstable-small";
2223
};
2324

2425
outputs =

nix/ext/versions.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,16 @@
572572
"pgrx": "0.12.9",
573573
"rust": "1.84.0"
574574
},
575+
"0.5.3": {
576+
"postgresql": [
577+
"15",
578+
"17",
579+
"orioledb-17"
580+
],
581+
"hash": "sha256-iaJriPEa0iVLpmnuUk9R3HS545Jhz7aH1clYvHEuEvs=",
582+
"pgrx": "0.14.3",
583+
"rust": "1.87.0"
584+
},
575585
"0.5.4": {
576586
"postgresql": [
577587
"15",

nix/packages/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
migrate-tool = pkgs.callPackage ./migrate-tool.nix { psql_15 = self'.packages."psql_15/bin"; };
4141
overlayfs-on-package = pkgs.callPackage ./overlayfs-on-package.nix { };
4242
packer = pkgs.callPackage ./packer.nix { inherit inputs; };
43+
pg-backrest = inputs.nixpkgs-pgbackrest.legacyPackages.${pkgs.system}.pgbackrest;
4344
pg-restore = pkgs.callPackage ./pg-restore.nix { psql_15 = self'.packages."psql_15/bin"; };
4445
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
4546
pg_regress = makePgRegress activeVersion;

0 commit comments

Comments
 (0)