summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAristid Breitkreuz <aristidb@gmail.com>2016-01-10 21:01:19 +0100
committerAristid Breitkreuz <aristidb@gmail.com>2016-01-10 21:01:19 +0100
commitbca9ecdd053399cab512b6e2fe9cc26523446006 (patch)
tree77aae3c67479a0b02cd2533820630d0b2e51a22f /nixos
parent71de39c6a6869faf761ba0128c2583f255007f5b (diff)
parent2c23a311cd8c83fa35413efc20e2ea6585bb0b89 (diff)
downloadnixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar.gz
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar.bz2
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar.lz
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar.xz
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.tar.zst
nixpkgs-bca9ecdd053399cab512b6e2fe9cc26523446006.zip
Merge pull request #12238 from bfrog/postgresql95
postgresql: 9.4 -> 9.5
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/databases/postgresql.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 16e3235eb2c..c2045a5859c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -122,8 +122,8 @@ in
         example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]";
         description = ''
           When this list contains elements a new store path is created.
-          PostgreSQL and the elments are symlinked into it. Then pg_config,
-          postgres and pc_ctl are copied to make them use the new
+          PostgreSQL and the elements are symlinked into it. Then pg_config,
+          postgres and pg_ctl are copied to make them use the new
           $out/lib directory as pkglibdir. This makes it possible to use postgis
           without patching the .sql files which reference $libdir/postgis-1.5.
         '';