From c9e8e912cb359360c31c22f2eb1a7da5cba62625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Jul 2023 18:20:14 -0700 Subject: [PATCH] nixos/patroni: use Python 3.10 --- nixos/modules/services/cluster/patroni/default.nix | 7 ++----- 1 file 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) ];