b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #250044 from sikmir/osm2pgsql

Browse source 
osm2pgsql: 1.8.1 → 1.9.0
This commit is contained in:
Nikolay Korotkiy 2023-08-19 16:25:44 +04:00 committed by GitHub
parent b107015d47 5fc0859884
commit d680ded26d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/tools/misc/osm2pgsql/default.nix
View file

@ -2,40 +2,34 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, expat , expat
, fetchpatch
, fmt , fmt
, proj , proj
, bzip2 , bzip2
, zlib , zlib
, boost , boost
, cimg
, postgresql , postgresql
, withLuaJIT ? false , withLuaJIT ? false
, lua , lua
, luajit , luajit
, libosmium , libosmium
, nlohmann_json
, potrace
, protozero , protozero
, testers , testers
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "osm2pgsql"; pname = "osm2pgsql";
version = "1.8.1"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openstreetmap"; owner = "openstreetmap";
repo = "osm2pgsql"; repo = "osm2pgsql";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y=";
}; };
patches = [
# Fix compatiblity with fmt 10.0. Remove with the next release
(fetchpatch {
url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch";
hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4=";
})
];
postPatch = '' postPatch = ''
# Remove bundled libraries # Remove bundled libraries
rm -r contrib rm -r contrib
@ -43,8 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] buildInputs = [
++ lib.optional withLuaJIT luajit boost
bzip2
cimg
expat
fmt
libosmium
nlohmann_json
postgresql
potrace
proj
protozero
zlib
] ++ lib.optional withLuaJIT luajit
++ lib.optional (!withLuaJIT) lua; ++ lib.optional (!withLuaJIT) lua;
cmakeFlags = [ cmakeFlags = [
@ -53,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
"-DEXTERNAL_FMT=ON" "-DEXTERNAL_FMT=ON"
] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
installFlags = [ "install-gen" ];
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage; package = finalAttrs.finalPackage;
}; };