diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
| commit | 081850816f98c7f5d815ac7251c69bf2ada50cc0 (patch) | |
| tree | 609b7e9e9c267e8c382bdebf8295b9f45bab6cc4 /gnu/packages/geo.scm | |
| parent | 792d526a256773d1abe00b73c2a2131037148139 (diff) | |
| parent | 93f178b5a84a8cc5a0c552290191efd2310588b5 (diff) | |
| download | patches-081850816f98c7f5d815ac7251c69bf2ada50cc0.tar patches-081850816f98c7f5d815ac7251c69bf2ada50cc0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/geo.scm')
| -rw-r--r-- | gnu/packages/geo.scm | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a48fa2387e..4761a277ae 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) @@ -201,15 +202,14 @@ and driving.") (define-public libgeotiff (package (name "libgeotiff") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) (sha256 - (base32 - "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd")) + (base32 "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq")) (modules '((guix build utils))) (snippet '(begin @@ -741,29 +741,6 @@ to create databases that are optimized for rendering/tile/map-services.") license:bsd-2 license:bsd-3)))) -(define-public protozero - (package - (name "protozero") - (version "1.6.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mapbox/protozero.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c")))) - (build-system cmake-build-system) - (home-page "https://github.com/mapbox/protozero") - (synopsis "Minimalistic protocol buffer decoder and encoder in C++") - (description "Protozero is a minimalistic protocol buffer decoder and -encoder in C++. The developer using protozero has to manually translate the -@file{.proto} description into code.") - (license (list - license:asl2.0 ; for folly - license:bsd-2)))) - (define-public libosmium (package (name "libosmium") |