me/guix
Archived
1
0
Fork 0
Code Activity

gnu: osm2pgsql: Update to 1.7.0.

Browse source 
* gnu/packages/geo.scm (osm2pgsql): Update to 1.7.0.
  [source]: Update snippet.
  [inputs]: Add fmt and rapidjson.
  [arguments]: Update 'configure-flags'.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Nikolay Korotkiy 2022-08-16 02:38:30 +03:00 • committed by Guillaume Le Vaillant
parent e4aca1cc3f
commit 0b69ed70ec
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/geo.scm
View file

@ -17,7 +17,7 @@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org> ;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com> ;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -100,6 +100,7 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -1322,7 +1323,7 @@ based on the Osmium library.")
(define-public osm2pgsql (define-public osm2pgsql
(package (package
(name "osm2pgsql") (name "osm2pgsql")
(version "1.5.1") (version "1.7.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1331,32 +1332,30 @@ based on the Osmium library.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj")) (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin ;; Remove bundled libraries.
(delete-file-recursively "contrib/protozero") '(delete-file-recursively "contrib"))))
(delete-file-recursively "contrib/libosmium")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f; tests fail because we need to setup a database `(#:tests? #f; tests fail because we need to setup a database
#:configure-flags #:configure-flags
(list (string-append "-DOSMIUM_INCLUDE_DIR=" (list "-DEXTERNAL_LIBOSMIUM=ON"
(assoc-ref %build-inputs "libosmium") "-DEXTERNAL_PROTOZERO=ON"
"/include") "-DEXTERNAL_FMT=ON"
(string-append "-DPROTOZERO_INCLUDE_DIR=" "-DEXTERNAL_RAPIDJSON=ON")))
(assoc-ref %build-inputs "protozero")
"/include"))))
(inputs (inputs
(list boost (list boost
bzip2 bzip2
expat expat
fmt
libosmium libosmium
lua lua
postgresql postgresql
proj proj
protozero protozero
rapidjson
zlib)) zlib))
(native-inputs (native-inputs
(list python python-psycopg2)) (list python python-psycopg2))