From: Nikolay Korotkiy via Guix-patches via <guix-patches@gnu.org>
To: 57233@debbugs.gnu.org
Cc: Nikolay Korotkiy <sikmir@disroot.org>
Subject: [bug#57233] [PATCH] gnu: osm2pgsql: Update to 1.7.0.
Date: Tue, 16 Aug 2022 02:38:30 +0300 [thread overview]
Message-ID: <c68ea7fc635b72d009a84b61d0f25b72849543ac.1660606710.git.sikmir@disroot.org> (raw)
* 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
next reply other threads:[~2022-08-15 23:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 23:38 Nikolay Korotkiy via Guix-patches via [this message]
2022-08-17 8:19 ` bug#57233: [PATCH] gnu: osm2pgsql: Update to 1.7.0 Guillaume Le Vaillant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c68ea7fc635b72d009a84b61d0f25b72849543ac.1660606710.git.sikmir@disroot.org \
--to=guix-patches@gnu.org \
--cc=57233@debbugs.gnu.org \
--cc=sikmir@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.