diff options
Diffstat (limited to 'gnu/packages/rpc.scm')
| -rw-r--r-- | gnu/packages/rpc.scm | 69 |
1 files changed, 15 insertions, 54 deletions
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 36c937dcef..1e5ba338df 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -5,7 +5,8 @@ ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim@guixotic.coop> +;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,42 +142,6 @@ 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") - (commit (string-append "v" version)))) - (file-name (git-file-name "grpc" version)) - (sha256 - (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) - (arguments - (substitute-keyword-arguments (package-arguments grpc) - ((#:phases phases) - #~(modify-phases #$phases - ;; Note: This would be nicer as a snippet, but that creates a tarball - ;; instead of a checkout and breaks assumptions made by the builder. - (add-after 'unpack 'rename-gettid - (lambda _ - ;; Rename custom gettid() syscall wrapper to avoid conflict - ;; with gettid() from glibc 2.30. - (substitute* '("src/core/lib/gpr/log_linux.cc" - "src/core/lib/gpr/log_posix.cc" - "src/core/lib/iomgr/ev_epollex_linux.cc") - (("gettid\\(") - "sys_gettid(")))))))) - (inputs - (modify-inputs (package-inputs grpc) - (replace "abseil-cpp" abseil-cpp-20200923.3))) - (native-inputs - (modify-inputs (package-native-inputs grpc) - (replace "protobuf" protobuf-3.6))))) - (define-public python-grpc-stubs (package (name "python-grpc-stubs") @@ -205,7 +170,7 @@ type information of gRPC.") (uri (pypi-uri "grpcio" version)) (sha256 (base32 "1nsgm8q4yahzdab4m3irffdw9zklq4kb7f8hki1ayfgw54ysim55")) - (modules '((guix build utils) (ice-9 ftw))) + (modules '((guix build utils) (ice-9 ftw) (srfi srfi-26))) (snippet '(begin ;; Delete this generated file. @@ -214,16 +179,14 @@ type information of gRPC.") ;; Delete the bundled source code of libraries that are possible ;; to provide as inputs. (for-each delete-file-recursively - (scandir "." - (lambda (file) - (not (member file - '("." ".." - "address_sorting" - "upb" - "xxhash"))))))))))) + (scandir "." (negate (cut member <> '("." ".." + "address_sorting" + "upb" + "xxhash")))))))))) (build-system pyproject-build-system) (arguments (list + #:tests? #f ; There seems to be no tests. #:phases #~(modify-phases %standard-phases (add-before 'build 'use-system-libraries @@ -248,16 +211,13 @@ type information of gRPC.") (lambda _ (substitute* '("setup.py" "src/python/grpcio/commands.py") (("'cc'") "'gcc'"))))))) - (inputs - (list abseil-cpp-cxxstd11 c-ares grpc openssl re2 zlib)) - (native-inputs - (list python-cython python-setuptools python-wheel)) - (propagated-inputs - (list python-six)) + (inputs (list abseil-cpp-cxxstd11 c-ares grpc openssl re2 zlib)) + (native-inputs (list python-cython-0 python-setuptools)) (home-page "https://grpc.io") (synopsis "HTTP/2-based RPC framework") - (description "This package provides a Python library for communicating -with the HTTP/2-based RPC framework gRPC.") + (description + "This package provides a Python library for communicating with the +HTTP/2-based RPC framework gRPC.") (license license:asl2.0))) (define-public python-grpcio-tools @@ -277,12 +237,13 @@ with the HTTP/2-based RPC framework gRPC.") (build-system pyproject-build-system) (arguments (list + #:tests? #f ;XXX: no tests in PyPI, try to bulid from Git #:phases #~(modify-phases %standard-phases (add-after 'unpack 'configure (lambda _ (setenv "GRPC_PYTHON_BUILD_WITH_CYTHON" "1")))))) - (native-inputs (list python-cython python-setuptools python-wheel)) + (native-inputs (list python-cython python-setuptools)) (propagated-inputs (list python-grpcio python-protobuf-4)) (home-page "https://grpc.io") (synopsis "Protobuf code generator for gRPC") |