From d708bb41a69b5fb7080e85f379a7081ec80d661c Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Tue, 2 Apr 2024 22:15:58 -0700
Subject: [PATCH] fix tests
---
modules/blocks/postgresql.nix | 2 +-
test/modules/postgresql.nix | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/blocks/postgresql.nix b/modules/blocks/postgresql.nix
index 6fb7759..038b079 100644
--- a/modules/blocks/postgresql.nix
+++ b/modules/blocks/postgresql.nix
@@ -138,7 +138,7 @@ in
(lib.mkIf cfg.enableTCPIP tcpConfig)
(debugConfig cfg.debug)
{
- environment.systemPackages = [
+ environment.systemPackages = lib.mkIf config.services.postgresql.enable [
(upgrade-script 13 14)
(upgrade-script 14 15)
(upgrade-script 15 16)
diff --git a/test/modules/postgresql.nix b/test/modules/postgresql.nix
index 961616d..d3102a3 100644
--- a/test/modules/postgresql.nix
+++ b/test/modules/postgresql.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
let
anyOpt = default: lib.mkOption {
type = lib.types.anything;
@@ -8,11 +8,13 @@ let
testConfig = m:
let
cfg = (lib.evalModules {
+ specialArgs = { inherit pkgs; };
modules = [
{
options = {
services = anyOpt {};
systemd = anyOpt {};
+ environment = anyOpt {};
};
}
../../modules/blocks/postgresql.nix