* [bug#57233] [PATCH] gnu: osm2pgsql: Update to 1.7.0.
@ 2022-08-15 23:38 Nikolay Korotkiy via Guix-patches via
2022-08-17 8:19 ` bug#57233: " Guillaume Le Vaillant
0 siblings, 1 reply; 2+ messages in thread
From: Nikolay Korotkiy via Guix-patches via @ 2022-08-15 23:38 UTC (permalink / raw)
To: 57233; +Cc: Nikolay Korotkiy
* gnu/packages/geo.scm (osm2pgsql): Update to 1.7.0.
---
gnu/packages/geo.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index fe2174b106..274beb0524 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -100,6 +100,7 @@ (define-module (gnu packages geo)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
@@ -1322,7 +1323,7 @@ (define-public osmium-tool
(define-public osm2pgsql
(package
(name "osm2pgsql")
- (version "1.5.1")
+ (version "1.7.0")
(source
(origin
(method git-fetch)
@@ -1331,32 +1332,30 @@ (define-public osm2pgsql
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj"))
+ (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii"))
(modules '((guix build utils)))
(snippet
- '(begin
- (delete-file-recursively "contrib/protozero")
- (delete-file-recursively "contrib/libosmium")
- #t))))
+ ;; Remove bundled libraries.
+ '(delete-file-recursively "contrib"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f; tests fail because we need to setup a database
#:configure-flags
- (list (string-append "-DOSMIUM_INCLUDE_DIR="
- (assoc-ref %build-inputs "libosmium")
- "/include")
- (string-append "-DPROTOZERO_INCLUDE_DIR="
- (assoc-ref %build-inputs "protozero")
- "/include"))))
+ (list "-DEXTERNAL_LIBOSMIUM=ON"
+ "-DEXTERNAL_PROTOZERO=ON"
+ "-DEXTERNAL_FMT=ON"
+ "-DEXTERNAL_RAPIDJSON=ON")))
(inputs
(list boost
bzip2
expat
+ fmt
libosmium
lua
postgresql
proj
protozero
+ rapidjson
zlib))
(native-inputs
(list python python-psycopg2))
--
2.37.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#57233: [PATCH] gnu: osm2pgsql: Update to 1.7.0.
2022-08-15 23:38 [bug#57233] [PATCH] gnu: osm2pgsql: Update to 1.7.0 Nikolay Korotkiy via Guix-patches via
@ 2022-08-17 8:19 ` Guillaume Le Vaillant
0 siblings, 0 replies; 2+ messages in thread
From: Guillaume Le Vaillant @ 2022-08-17 8:19 UTC (permalink / raw)
To: Nikolay Korotkiy; +Cc: 57233-done
[-- Attachment #1: Type: text/plain, Size: 98 bytes --]
Patch pushed as 0b69ed70eca72aef6364be650d9e2f7e8c97ac0c with
a completed commit message.
Thanks.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-17 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-15 23:38 [bug#57233] [PATCH] gnu: osm2pgsql: Update to 1.7.0 Nikolay Korotkiy via Guix-patches via
2022-08-17 8:19 ` bug#57233: " Guillaume Le Vaillant
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).