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

Merge pull request #12238 from bfrog/postgresql95

Browse Source 
postgresql: 9.4 -> 9.5
This commit is contained in:
Aristid Breitkreuz 2016-01-10 21:01:19 +01:00
commit bca9ecdd05
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/databases/postgresql.nix
View File

@ -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.
'';

7
pkgs/servers/sql/postgresql/default.nix
View File

@ -88,4 +88,11 @@ in {
sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q";
};
postgresql95 = common {
version = "9.5.0";
psqlSchema = "9.5";
sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc";
};
}

3
pkgs/top-level/all-packages.nix
View File

@ -9456,7 +9456,8 @@ let
postgresql91
postgresql92
postgresql93
postgresql94;
postgresql94
postgresql95;
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };