From 9b0c794d2cd2969a0949fde6cc1011c44d54a79f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Mar 2023 11:09:23 -0400 Subject: gnu: ruby-protobuf: Update to 3.10.3. * gnu/packages/protobuf.scm (ruby-protobuf): Update to 3.10.3. Delete trailing #t. [arguments]: Use search-input-file in patch-protoc phase. Honor #:tests? in check phase. --- gnu/packages/protobuf.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index a746b7de9c..82cf8f452d 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Felix Gruber @@ -513,7 +513,7 @@ source files.") (define-public ruby-protobuf (package (name "ruby-protobuf") - (version "3.10.3") + (version "3.10.7") (source (origin (method git-fetch) (uri (git-reference @@ -522,7 +522,7 @@ source files.") (file-name (git-file-name name version)) (sha256 (base32 - "1yzz7jgpp6qip5d6qhzbkf5gqaydfk3z3c1ngccwzp6w6wa75g8a")))) + "12hp1clg83jfl35x1h2ymzpj5w83wrnqw7hjfc6mqa8lsvpw535r")))) (build-system ruby-build-system) (arguments `(#:phases @@ -530,8 +530,7 @@ source files.") (add-after 'unpack 'do-not-use-bundler-for-tests (lambda _ (substitute* "spec/spec_helper.rb" - (("Bundler\\.setup.*") "")) - #t)) + (("Bundler\\.setup.*") "")))) (add-after 'unpack 'relax-version-requirements (lambda _ (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) @@ -540,33 +539,30 @@ source files.") (("\"rubocop\",.*") "'rubocop'\n") (("\"parser\",.*") - "'parser'\n")) - #t)) + "'parser'\n")))) (add-after 'unpack 'patch-protoc (lambda* (#:key inputs #:allow-other-keys) - (let ((protoc (assoc-ref inputs "protobuf"))) - (substitute* "lib/protobuf/tasks/compile.rake" - (("\"protoc\"") - (string-append "\"" protoc "/bin/protoc" "\""))) - #t))) + (substitute* "lib/protobuf/tasks/compile.rake" + (("\"protoc\"") + (string-append "\"" (search-input-file inputs "bin/protoc") + "\""))))) (add-after 'unpack 'skip-failing-test ;; See: https://github.com/ruby-protobuf/protobuf/issues/419 (lambda _ (substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb" (("expect\\(::IO\\)\\.to receive\\(:select\\).*" all) - (string-append " pending\n" all))) - #t)) + (string-append " pending\n" all))))) (add-after 'replace-git-ls-files 'replace-more-git-ls-files (lambda _ (substitute* ((@@ (guix build ruby-build-system) first-gemspec)) (("`git ls-files -- \\{test,spec,features\\}/*`") "`find test spec features -type f | sort`") (("`git ls-files -- bin/*`") - "`find bin -type f | sort`")) - #t)) + "`find bin -type f | sort`")))) (replace 'check - (lambda _ - (invoke "rspec")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec"))))))) (native-inputs (list ruby-benchmark-ips ruby-ffi-rzmq @@ -584,7 +580,10 @@ source files.") (inputs (list protobuf)) (propagated-inputs - (list ruby-activesupport ruby-middleware ruby-thor ruby-thread-safe)) + (list ruby-activesupport + ruby-middleware + ruby-thor + ruby-thread-safe)) (home-page "https://github.com/ruby-protobuf/protobuf") (synopsis "Implementation of Google's Protocol Buffers in Ruby") (description "Protobuf is an implementation of Google's Protocol Buffers -- cgit v1.2.3