diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
| commit | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (patch) | |
| tree | 0bc92edb753cfdf9a9e7ef763ebc19f0cd2d528c /gnu/packages/protobuf.scm | |
| parent | ad79ae7e2d7505292b11e87302b08f4db0f934e9 (diff) | |
| parent | e5ad2cdf172eecc7edef37a500593b1941af013c (diff) | |
| download | guix-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar guix-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/protobuf.scm')
| -rw-r--r-- | gnu/packages/protobuf.scm | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 85e3170b98..028b2f21e1 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> -;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -30,7 +30,8 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages libevent) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz)) (define-public fstrm (package @@ -108,6 +109,19 @@ yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.") (license license:bsd-3))) +(define-public protobuf-next + (package (inherit protobuf) + (name "protobuf") + (version "3.6.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/protobuf/releases/" + "download/v" version "/protobuf-cpp-" + version ".tar.gz")) + (sha256 + (base32 + "0a955bz59ihrb5wg7dwi12xajdi5pmz4bl0g147rbdwv393jwwxk")))))) + ;; XXX Remove this old version when no other packages depend on it. (define-public protobuf-2 (package (inherit protobuf) |