diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/rpc.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/rpc.scm')
| -rw-r--r-- | gnu/packages/rpc.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 4a279874ce..f02fa66f6c 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> @@ -42,7 +42,8 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages regex) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (srfi srfi-1)) (define-public grpc (package @@ -152,7 +153,10 @@ browsers to backend services.") "src/core/lib/iomgr/ev_epollex_linux.cc") (("gettid\\(") "sys_gettid(")) - #t)))))))) + #t)))))) + (native-inputs + `(("protobuf" ,protobuf-3.6) + ,@(alist-delete "protobuf" (package-native-inputs grpc)))))) (define-public python-grpcio (package @@ -209,7 +213,7 @@ with the HTTP/2-based RPC framework gRPC.") (define-public apache-thrift (package (name "apache-thrift") - (version "0.14.1") + (version "0.14.2") (source (origin (method git-fetch) @@ -218,7 +222,7 @@ with the HTTP/2-based RPC framework gRPC.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mj3c5jhjbg2sfkx9k9jqg88h1c5rswr9b606s02ny9ydf3akcny")))) + (base32 "0wmnb3h0xq8qc5a9g9lliszh6qg254f5856h72viab46bizmdd4a")))) (build-system gnu-build-system) (arguments '(#:tests? #f |