privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

checks/patroni: use our postgresql

Browse source
This commit is contained in:
Max Headroom 2023-08-23 21:22:46 +02:00
parent f71774102e
commit 486161b78e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/checks/default.nix
View file

@ -9,6 +9,7 @@
patroni = pkgs.callPackage ./patroni.nix { patroni = pkgs.callPackage ./patroni.nix {
inherit (self) nixosModules; inherit (self) nixosModules;
inherit (self'.packages) postgresql;
}; };
searxng = pkgs.callPackage ./searxng.nix { searxng = pkgs.callPackage ./searxng.nix {
inherit (self'.packages) searxng; inherit (self'.packages) searxng;

6
packages/checks/patroni.nix
View file

@ -1,4 +1,4 @@
{ nixosTest, nixosModules }: { nixosTest, nixosModules, postgresql }:
# taken from https://github.com/phfroidmont/nixpkgs/blob/patroni-module/nixos/tests/patroni.nix # taken from https://github.com/phfroidmont/nixpkgs/blob/patroni-module/nixos/tests/patroni.nix
nixosTest ( nixosTest (
@ -31,7 +31,7 @@ nixosTest (
enable = true; enable = true;
postgresqlPackage = pkgs.postgresql_14.withPackages (p: [ p.pg_safeupdate ]); postgresqlPackage = postgresql.withPackages (p: [ p.pg_safeupdate ]);
scope = "cluster1"; scope = "cluster1";
name = "node${toString(index + 1)}"; name = "node${toString(index + 1)}";
@ -119,7 +119,7 @@ nixosTest (
}; };
client = { pkgs, ... }: { client = { pkgs, ... }: {
environment.systemPackages = [ pkgs.postgresql_14 ]; environment.systemPackages = [ postgresql ];
networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
{ address = "192.168.2.1"; prefixLength = 16; } { address = "192.168.2.1"; prefixLength = 16; }