public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Support PostgreSQL versions >= 8.4, which have a slightly different

Browse Source 
pg_hba.conf format.

svn path=/nixos/trunk/; revision=33268
This commit is contained in:
Eelco Dolstra 2012-03-19 18:06:18 +00:00
parent fac0fef5d8
commit 31c93522d5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/services/databases/postgresql.nix
View File

@ -10,7 +10,7 @@ let
postgresqlAndPlugins = pg: postgresqlAndPlugins = pg:
if cfg.extraPlugins == [] then pg if cfg.extraPlugins == [] then pg
else pkgs.buildEnv { else pkgs.buildEnv {
name = "postgresql-and-plugins"; name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}";
paths = [ pg ] ++ cfg.extraPlugins; paths = [ pg ] ++ cfg.extraPlugins;
postBuild = postBuild =
'' ''
@ -35,6 +35,8 @@ let
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
in in
{ {
@ -133,7 +135,7 @@ in
services.postgresql.authentication = services.postgresql.authentication =
'' ''
# Generated file; do not edit! # Generated file; do not edit!
local all all ident sameuser local all all ident ${optionalString pre84 "sameuser"}
host all all 127.0.0.1/32 md5 host all all 127.0.0.1/32 md5
host all all ::1/128 md5 host all all ::1/128 md5
''; '';