gnu: gRPC: Update to 1.27.3.

* gnu/packages/rpc.scm (grpc): Update to 1.27.3.
[arguments]: Add "-DgRPC_ABSL_PROVIDER=package" in #:configure-flags.
[inputs]: Add ABSEIL-CPP.
(grpc-1.16.1): New public variable.
* gnu/packages/hyperledger.scm (hyperledger-iroha)[inputs]: Change from GRPC
to GRPC-1.16.
* gnu/packages/machine-learning.scm (tensorflow)[native-inputs, inputs]: Likewise.
This commit is contained in:
Marius Bakke 2020-03-21 12:33:15 +01:00
parent c28a8855f1
commit 447fafe3d7
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 25 additions and 6 deletions

@ -190,7 +190,7 @@ link-time. New implementations can be added as well.")
(inputs (inputs
`(("boost" ,boost-1.69) `(("boost" ,boost-1.69)
("gflags" ,gflags) ("gflags" ,gflags)
("grpc" ,grpc) ("grpc" ,grpc-1.16.1)
("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519) ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("protobuf" ,protobuf) ("protobuf" ,protobuf)

@ -1708,7 +1708,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
(sha256 (sha256
(base32 (base32
"161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign")))))
("grpc" ,grpc "static") ("grpc" ,grpc-1.16.1 "static")
("googletest" ,googletest) ("googletest" ,googletest)
("swig" ,swig) ("swig" ,swig)
("unzip" ,unzip))) ("unzip" ,unzip)))
@ -1730,7 +1730,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libpng" ,libpng) ("libpng" ,libpng)
("giflib" ,giflib) ("giflib" ,giflib)
("grpc:bin" ,grpc) ("grpc:bin" ,grpc-1.16.1)
("jsoncpp" ,jsoncpp-for-tensorflow) ("jsoncpp" ,jsoncpp-for-tensorflow)
("snappy" ,snappy) ("snappy" ,snappy)
("sqlite" ,sqlite) ("sqlite" ,sqlite)

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,6 +27,7 @@
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages adns) #:use-module (gnu packages adns)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -34,7 +36,7 @@
(define-public grpc (define-public grpc
(package (package
(name "grpc") (name "grpc")
(version "1.16.1") (version "1.27.3")
(outputs '("out" "static")) (outputs '("out" "static"))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -44,12 +46,13 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) "0czmbwnafc7jnrrq2fnac2av83vs2q7q0wy4k11w9zbpld7j5h6d"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no test target `(#:tests? #f ; no test target
#:configure-flags #:configure-flags
(list "-DgRPC_ZLIB_PROVIDER=package" (list "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_ABSL_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package"
@ -89,7 +92,8 @@
(find-files "." "\\.a$")))) (find-files "." "\\.a$"))))
#t))))) #t)))))
(inputs (inputs
`(("c-ares" ,c-ares/cmake) `(("abseil-cpp" ,abseil-cpp)
("c-ares" ,c-ares/cmake)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
@ -105,6 +109,21 @@ mile of distributed computing to connect devices, mobile applications and
browsers to backend services.") browsers to backend services.")
(license license:asl2.0))) (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 (define-public python-grpcio
(package (package
(name "python-grpcio") (name "python-grpcio")