ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: osm2pgsql: Update to 1.11.0.

Browse source 
* gnu/packages/geo.scm (osm2pgsql): Update to 1.11.0.
[arguments]: Look for proj API version 6 to use recent proj versions.
[inputs]: Remove proj-7; add cli11 and proj.

Change-Id: If1f14e5c675865d4485b16aca6146f555cc16d5e
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Felix Gruber 2024-02-24 15:15:01 +00:00 committed by Guillaume Le Vaillant
parent b25b94335a
commit cc7486cd98
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/geo.scm
View file

@ -1677,7 +1677,7 @@ (define-public osmium-tool
(define-public osm2pgsql (define-public osm2pgsql
(package (package
(name "osm2pgsql") (name "osm2pgsql")
(version "1.9.2") (version "1.11.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1686,7 +1686,7 @@ (define-public osm2pgsql
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7")) "135vqahlcrhwa3b9hfgbiqkzbbsjd4i79fp41cd0rp4zarcpi47p"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
@ -1694,20 +1694,21 @@ (define-public osm2pgsql
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #: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 #~(list "-DUSE_PROJ_LIB=4" ;use API version 4 #:configure-flags #~(list "-DUSE_PROJ_LIB=6" ;use API version 6
"-DWITH_LUAJIT=ON" "-DWITH_LUAJIT=ON"
"-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_LIBOSMIUM=ON"
"-DEXTERNAL_PROTOZERO=ON" "-DEXTERNAL_PROTOZERO=ON"
"-DEXTERNAL_FMT=ON"))) "-DEXTERNAL_FMT=ON")))
(inputs (list boost (inputs (list boost
bzip2 bzip2
cli11
expat expat
fmt-8 fmt-8
libosmium libosmium
luajit luajit
nlohmann-json nlohmann-json
postgresql postgresql
proj-7 proj
protozero protozero
zlib)) zlib))
(native-inputs (list pandoc python python-argparse-manpage)) (native-inputs (list pandoc python python-argparse-manpage))