aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/geo.scm
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2020-03-20 17:57:35 +0100
committerGuillaume Le Vaillant <glv@posteo.net>2020-03-20 18:17:21 +0100
commit6145b16778aec8b22daebd9779d65a22cd8843b5 (patch)
tree2c85eb64b0df566e1167c314489ee8766fc63955 /gnu/packages/geo.scm
parent7ba300ee6ed55eac61e46aa1c0b7de1a65a69ac3 (diff)
downloadguix-6145b16778aec8b22daebd9779d65a22cd8843b5.tar
guix-6145b16778aec8b22daebd9779d65a22cd8843b5.tar.gz
gnu: osm2pgsql: Update to 1.2.1.
* gnu/packages/geo.scm (osm2pgsql): Update to 1.2.1. [inputs]: Add bzip2 and replace proj.4 by proj. [native-inputs]: Replace python-2 by python and python2-psycopg2 by python-psycopg2.
Diffstat (limited to 'gnu/packages/geo.scm')
-rw-r--r--gnu/packages/geo.scm11
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 0f22443cbb..bc870f9620 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -873,7 +873,7 @@ OpenStreetMap data.")
(define-public osm2pgsql
(package
(name "osm2pgsql")
- (version "0.96.0")
+ (version "1.2.1")
(source
(origin
(method git-fetch)
@@ -882,7 +882,7 @@ OpenStreetMap data.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"))
+ (base32 "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -901,16 +901,17 @@ OpenStreetMap data.")
"/include"))))
(inputs
`(("boost" ,boost)
+ ("bzip2" ,bzip2)
("expat" ,expat)
("libosmium" ,libosmium)
("lua" ,lua)
("postgresql" ,postgresql)
- ("proj.4" ,proj.4)
+ ("proj" ,proj)
("protozero" ,protozero)
("zlib" ,zlib)))
(native-inputs
- `(("python-2" ,python-2)
- ("python2-psycopg2" ,python2-psycopg2)))
+ `(("python" ,python)
+ ("python-psycopg2" ,python-psycopg2)))
(home-page "https://github.com/openstreetmap/osm2pgsql")
(synopsis "OSM data importer to postgresql")
(description "Osm2pgsql is a tool for loading OpenStreetMap data into a