osm2pgsql: 0.92.1-unstable -> 0.96.0

This commit is contained in:
Jonathan Ringer 2019-07-11 04:06:01 -07:00
parent deaa36da0c
commit 4d91c30a4c

View File

@ -1,28 +1,26 @@
{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
let
version = "0.92.1-unstable";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "osm2pgsql-${version}"; name = "osm2pgsql-${version}";
version = "0.96.0";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/openstreetmap/osm2pgsql.git"; owner = "openstreetmap";
rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; repo = "osm2pgsql";
# Still waiting on release after: rev = version;
# https://github.com/openstreetmap/osm2pgsql/pull/684 sha256 = "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl";
# https://github.com/openstreetmap/osm2pgsql/issues/634
#rev = "refs/tags/${version}";
sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy";
}; };
nativeBuildInputs = [cmake];
buildInputs = [expat proj bzip2 zlib boost postgresql lua];
meta = { nativeBuildInputs = [ cmake ];
buildInputs = [ expat proj bzip2 zlib boost postgresql lua ];
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
meta = with stdenv.lib; {
description = "OpenStreetMap data to PostgreSQL converter"; description = "OpenStreetMap data to PostgreSQL converter";
version = "0.92.1-unstable";
homepage = https://github.com/openstreetmap/osm2pgsql; homepage = https://github.com/openstreetmap/osm2pgsql;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }