Merge branch 'master' of github.com:NixOS/nixos into systemd

2012-08-20 11:27:38 -04:00
parent 36e05e8dd2 16713db4e2
commit 08f14b33c1
30 changed files with 305 additions and 107 deletions
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -20,7 +20,7 @@ let
        '';
    };

-  postgresql = postgresqlAndPlugins pkgs.postgresql;
+  postgresql = postgresqlAndPlugins cfg.package;

  run = "su -s ${pkgs.stdenv.shell} postgres";

@@ -54,6 +54,13 @@ in
        '';
      };

+      package = mkOption {
+        default = pkgs.postgresql;
+        description = ''
+          PostgreSQL package to use.
+        '';
+      };
+
      port = mkOption {
        default = "5432";
        description = ''