From 2bb9abc7623d6feb8660c6cb8b570d274a1b0614 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 4 Oct 2022 23:34:02 +0300 Subject: [PATCH] =?UTF-8?q?osm2pgsql:=201.7.0=20=E2=86=92=201.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/osm2pgsql/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 297f98ee3db3..ee290402962c 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -14,17 +14,18 @@ , libosmium , protozero , rapidjson +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "openstreetmap"; - repo = pname; - rev = version; - hash = "sha256-MWJzCZdqvy/nH1Doj0fmGuzTubaHDnPOED7qgzvJ3ZU="; + repo = "osm2pgsql"; + rev = finalAttrs.version; + hash = "sha256-+//cAoN8m66SboEYP5Dhtm0q0+oyvEr5o584e4JQ9xM="; }; postPatch = '' @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; @@ -52,4 +57,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ jglukasik das-g ]; }; -} +})