From 88beddccead0f502d0434bd818b3fa33ce0a6fe2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 24 Jun 2021 23:40:17 +0200
Subject: gnu: apache-thrift: Update to 0.14.2.

* gnu/packages/rpc.scm (apache-thrift): Update to 0.14.2.
---
 gnu/packages/rpc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/rpc.scm')

diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index 4a279874ce..2e7f579117 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -209,7 +209,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 +218,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
-- 
cgit v1.2.3


From 73a5891d744c69ab01433b568ba5c55dd927f139 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 4 Jul 2021 12:52:32 +0300
Subject: gnu: grpc-1.16.1: Build with older protobuf.

* gnu/packages/rpc.scm (grpc-1.16.1)[native-inputs]: Replace protobuf
with protobuf-3.6.
---
 gnu/packages/rpc.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/rpc.scm')

diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index 2e7f579117..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
-- 
cgit v1.2.3