Merge master into staging-next

pkgs/servers/sql/postgresql/ext/pg_cron.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "pg_cron-${version}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "pg_cron";
     rev    = "refs/tags/v${version}";
-    sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1";
+    sha256 = "0r33b0c9gdx2lfhrp7lpkif3j8qbzxmnywkcs2rcxwf9qzrb4vnj";
   };
 
   installPhase = ''

pkgs/servers/sql/postgresql/ext/postgis.nix

@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   name = "postgis-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv";
+    sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn";
   };
 
   buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ];