From 2c23a311cd8c83fa35413efc20e2ea6585bb0b89 Mon Sep 17 00:00:00 2001 From: Tom Burdick Date: Fri, 8 Jan 2016 09:47:03 -0600 Subject: [PATCH] postgresql: (94 -> 95) Updates postgresql to its latest versions --- nixos/modules/services/databases/postgresql.nix | 4 ++-- pkgs/servers/sql/postgresql/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 16e3235eb2c8..c2045a5859c5 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. ''; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 7a0ecdfd9528..9a5b07e9f89a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -88,4 +88,11 @@ in { sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q"; }; + postgresql95 = common { + version = "9.5.0"; + psqlSchema = "9.5"; + sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc"; + }; + + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6bb0070912b..458939770062 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9444,7 +9444,8 @@ let postgresql91 postgresql92 postgresql93 - postgresql94; + postgresql94 + postgresql95; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };