Unverified Commit d0299f7f authored by pennae's avatar pennae Committed by GitHub
Browse files

Merge pull request #243570 from dotlambda/patroni-python310

nixos/patroni: use Python 3.10
parents 23bb0627 c9e8e912
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -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)
    ];