aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/hyperledger.scm2
-rw-r--r--gnu/packages/machine-learning.scm4
-rw-r--r--gnu/packages/rpc.scm25
3 files changed, 25 insertions, 6 deletions
diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm
index 1aed8e23d8..86eb86d3b5 100644
--- a/gnu/packages/hyperledger.scm
+++ b/gnu/packages/hyperledger.scm
@@ -190,7 +190,7 @@ link-time. New implementations can be added as well.")
(inputs
`(("boost" ,boost-1.69)
("gflags" ,gflags)
- ("grpc" ,grpc)
+ ("grpc" ,grpc-1.16.1)
("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519)
("postgresql" ,postgresql)
("protobuf" ,protobuf)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index faf4bacfe3..8ff68123d1 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1708,7 +1708,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
(sha256
(base32
"161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign")))))
- ("grpc" ,grpc "static")
+ ("grpc" ,grpc-1.16.1 "static")
("googletest" ,googletest)
("swig" ,swig)
("unzip" ,unzip)))
@@ -1730,7 +1730,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("giflib" ,giflib)
- ("grpc:bin" ,grpc)
+ ("grpc:bin" ,grpc-1.16.1)
("jsoncpp" ,jsoncpp-for-tensorflow)
("snappy" ,snappy)
("sqlite" ,sqlite)
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index 991dc89324..3691440590 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
#:use-module (guix build-system python)
#:use-module (gnu packages adns)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
@@ -34,7 +36,7 @@
(define-public grpc
(package
(name "grpc")
- (version "1.16.1")
+ (version "1.27.3")
(outputs '("out" "static"))
(source (origin
(method git-fetch)
@@ -44,12 +46,13 @@
(file-name (git-file-name name version))
(sha256
(base32
- "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2"))))
+ "0czmbwnafc7jnrrq2fnac2av83vs2q7q0wy4k11w9zbpld7j5h6d"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no test target
#:configure-flags
(list "-DgRPC_ZLIB_PROVIDER=package"
+ "-DgRPC_ABSL_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
@@ -89,7 +92,8 @@
(find-files "." "\\.a$"))))
#t)))))
(inputs
- `(("c-ares" ,c-ares/cmake)
+ `(("abseil-cpp" ,abseil-cpp)
+ ("c-ares" ,c-ares/cmake)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
@@ -105,6 +109,21 @@ mile of distributed computing to connect devices, mobile applications and
browsers to backend services.")
(license license:asl2.0)))
+;; Some packages require this older version.
+(define-public grpc-1.16.1
+ (package
+ (inherit grpc)
+ (version "1.16.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/grpc/grpc.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "grpc" version))
+ (sha256
+ (base32
+ "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2"))))))
+
(define-public python-grpcio
(package
(name "python-grpcio")