diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-03-15 12:48:54 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-03-15 20:30:41 +0100 |
| commit | dc8621a2c1f010bf5d8b3365e26b66603a8f2fd4 (patch) | |
| tree | 08c2d15734da552e357daff56ede258434af174b /gnu | |
| parent | 8dfdd746e11c426dd37366bce6211e1e4accaccb (diff) | |
| download | guix-dc8621a2c1f010bf5d8b3365e26b66603a8f2fd4.tar guix-dc8621a2c1f010bf5d8b3365e26b66603a8f2fd4.tar.gz | |
gnu: Move protozero to (gnu packages protobuf).
* gnu/packages/geo.scm (protozero): Move from here…
* gnu/packages/protobuf.scm (protozero): …to here.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/geo.scm | 24 | ||||
| -rw-r--r-- | gnu/packages/protobuf.scm | 25 |
2 files changed, 26 insertions, 23 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 58eb11231f..c7026c4e96 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) @@ -740,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.7") - (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 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) - (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") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 028b2f21e1..73169216b4 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -23,6 +23,8 @@ (define-module (gnu packages protobuf) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) @@ -160,6 +162,29 @@ generator that converts Protocol Buffer @code{.proto} files to C descriptor code.") (license license:bsd-2))) +(define-public protozero + (package + (name "protozero") + (version "1.6.7") + (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 "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3")))) + (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 python-protobuf (package (name "python-protobuf") |