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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-08-17 14:54:39 +02:00
parent 566683ab5e 914b9788fd
commit 0ac85bc455
531 changed files with 2778 additions and 6274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/postgresql/ext/plv8.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "plv8";
version = "2.3.14";
version = "2.3.15";
nativeBuildInputs = [ perl ];
buildInputs = [ v8 postgresql ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "plv8";
repo = "plv8";
rev = "v${version}";
sha256 = "12g7z0xkb6zg2qd0hppk2izq238v1k52vb13jlvaij1rbhh10mbp";
sha256 = "1cv94n49gq2b377gqyq7pjjzw98czv4mwl3sx97y18c20zwp6rk3";
};
makefile = "Makefile.shared";

4
pkgs/servers/sql/postgresql/ext/postgis.nix
View File

@@ -14,13 +14,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.0.1";
version = "3.0.2";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
sha256 = "0lv37v8f3143kfm9sdvw59461q2lndxiqvaw47lvmnaha7wk4m2s";
sha256 = "1jmji8i2wjabkrzqil683lypnmimigdmn64a10j3kj3kzlfn98d3";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]