From 2ab9b4ce75fbd12365196484415e0d2704795613 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 4 Jun 2019 22:31:27 +0200 Subject: Let specify a package for pgbackup --- modules/apps/pgbackup.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/apps/pgbackup.nix b/modules/apps/pgbackup.nix index 8eb0726..a0c1f56 100644 --- a/modules/apps/pgbackup.nix +++ b/modules/apps/pgbackup.nix @@ -8,7 +8,7 @@ let findFirst hasPrefix mapAttrsToList mkIf mkOption optionalString removeSuffix ; inherit (lib.types) - bool enum int listOf nullOr path str submodule ; + bool enum int listOf nullOr package path str submodule ; cfg = config.nixsap.apps.pgbackup; privateDir = "/run/pgbackup"; @@ -80,7 +80,7 @@ let # XXX: Use the latest pg_dump: pg_dump = pkgs.writeBashScript name '' ${optionalString (cfg.pgpass != null) "export PGPASSFILE='${cfg.pgpass}'"} - exec ${pkgs.postgresql95}/bin/pg_dump \ + exec ${cfg.package}/bin/pg_dump \ ${concatMapAttrsSep " " mkArg args} \ "$@" ''; @@ -256,6 +256,13 @@ let in { options.nixsap.apps.pgbackup = { + + package = mkOption { + description = "PostgreSQL package providing pg_dump"; + type = package; + default = pkgs.postgresql; + }; + user = mkOption { description = "User to run as"; default = "pgbackup"; -- cgit v1.2.3