gnu: osm2pgsql: Update to 1.9.2.

* gnu/packages/geo.scm (osm2pgsql): Update to 1.9.2.
  [arguments]: Use G-expressions.
  <#:configure-flags>: Ensure compilation with LuaJIT, PROJ API version 4.
  [inputs]: Replace lua with luajit. Replace proj with proj-7. Add
  nlohmann-json.
  [native-inputs]: Add pandoc, python-argparse-manpage, for building
  documentation. Remove python-psycopg2, as it is only used for tests, and
  testing has been disabled.
  [home-page]: Update URL.

Reviewed-by: Bruno Victal <mirai@makinata.eu>
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Hendursaga 2023-09-17 15:39:36 -04:00 committed by Guillaume Le Vaillant
parent 84442d0423
commit ef18fd58b4
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F

View file

@ -1596,43 +1596,44 @@ (define-public osmium-tool
(define-public osm2pgsql (define-public osm2pgsql
(package (package
(name "osm2pgsql") (name "osm2pgsql")
(version "1.8.0") (version "1.9.2")
(source (source (origin
(origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/openstreetmap/osm2pgsql")
(url "https://github.com/openstreetmap/osm2pgsql") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz")) "198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
'(delete-file-recursively "contrib")))) '(delete-file-recursively "contrib"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f; tests fail because we need to setup a database (list #:tests? #f ;tests fail because we need to setup a database
#:configure-flags #:configure-flags #~(list "-DUSE_PROJ_LIB=4" ;use API version 4
(list "-DEXTERNAL_LIBOSMIUM=ON" "-DWITH_LUAJIT=ON"
"-DEXTERNAL_PROTOZERO=ON" "-DEXTERNAL_LIBOSMIUM=ON"
"-DEXTERNAL_FMT=ON"))) "-DEXTERNAL_PROTOZERO=ON"
(inputs "-DEXTERNAL_FMT=ON")))
(list boost (inputs (list boost
bzip2 bzip2
expat expat
fmt-8 fmt-8
libosmium libosmium
lua luajit
postgresql nlohmann-json
proj postgresql
protozero proj-7
zlib)) protozero
(native-inputs zlib))
(list python python-psycopg2)) (native-inputs (list pandoc python python-argparse-manpage))
(home-page "https://github.com/openstreetmap/osm2pgsql") (home-page "https://osm2pgsql.org/")
(synopsis "OSM data importer to postgresql") (synopsis "OSM data importer to PostgreSQL")
(description "Osm2pgsql is a tool for loading OpenStreetMap data into a (description
"Osm2pgsql is a tool for loading OpenStreetMap data into a
PostgreSQL / PostGIS database suitable for applications like rendering into a PostgreSQL / PostGIS database suitable for applications like rendering into a
map, geocoding with Nominatim, or general analysis.") map, geocoding with Nominatim, or general analysis.")
(license license:gpl2+))) (license license:gpl2+)))