summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/cluster
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-07-14 18:20:14 -0700
committerRobert Schütz <nix@dotlambda.de>2023-07-14 18:20:14 -0700
commitc9e8e912cb359360c31c22f2eb1a7da5cba62625 (patch)
tree323f39a06a2f3641a476d4fafa598cdf060a2097 /nixos/modules/services/cluster
parent110489e12ab7fd2f4974f6a661c1e4e1a9341603 (diff)
nixos/patroni: use Python 3.10
Diffstat (limited to 'nixos/modules/services/cluster')
-rw-r--r--nixos/modules/services/cluster/patroni/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/patroni/default.nix b/nixos/modules/services/cluster/patroni/default.nix
index 83b372f59497..9bf3a285836c 100644
--- a/nixos/modules/services/cluster/patroni/default.nix
+++ b/nixos/modules/services/cluster/patroni/default.nix
@@ -6,9 +6,6 @@ let
defaultGroup = "patroni";
format = pkgs.formats.yaml { };
- #boto doesn't support python 3.10 yet
- patroni = pkgs.patroni.override { pythonPackages = pkgs.python39Packages; };
-
configFileName = "patroni-${cfg.scope}-${cfg.name}.yaml";
configFile = format.generate configFileName cfg.settings;
in
@@ -224,7 +221,7 @@ in
script = ''
${concatStringsSep "\n" (attrValues (mapAttrs (name: path: ''export ${name}="$(< ${escapeShellArg path})"'') cfg.environmentFiles))}
- exec ${patroni}/bin/patroni ${configFile}
+ exec ${pkgs.patroni}/bin/patroni ${configFile}
'';
serviceConfig = mkMerge [
@@ -252,7 +249,7 @@ in
'';
environment.systemPackages = [
- patroni
+ pkgs.patroni
cfg.postgresqlPackage
(mkIf cfg.raft pkgs.python310Packages.pysyncobj)
];