Merge pull request #13572 from agbell/master

postgis 2.1.4 -> 2.2.1
This commit is contained in:
joachifm 2016-03-02 19:40:50 +00:00
commit 7250ef5fcb

View file

@ -5,7 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p
### NixOS - usage: ### NixOS - usage:
================== ==================
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]; services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_2_1 ];
### important Postgis implementation details: ### important Postgis implementation details:
@ -84,9 +84,9 @@ let
in rec { in rec {
v_2_1_4 = pgDerivationBaseNewer.merge ( fix : { v_2_2_1 = pgDerivationBaseNewer.merge ( fix : {
version = "2.1.4"; version = "2.2.1";
sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd"; sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g";
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
builtInputs = [gdal json_c pkgconfig]; builtInputs = [gdal json_c pkgconfig];
dontDisableStatic = true; dontDisableStatic = true;