me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2023-03-15 11:09:23 -04:00
parent a6f56be103
commit 9b0c794d2c
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/protobuf.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
@ -513,7 +513,7 @@ source files.")
(define-public ruby-protobuf (define-public ruby-protobuf
(package (package
(name "ruby-protobuf") (name "ruby-protobuf")
(version "3.10.3") (version "3.10.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -522,7 +522,7 @@ source files.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1yzz7jgpp6qip5d6qhzbkf5gqaydfk3z3c1ngccwzp6w6wa75g8a")))) "12hp1clg83jfl35x1h2ymzpj5w83wrnqw7hjfc6mqa8lsvpw535r"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -530,8 +530,7 @@ source files.")
(add-after 'unpack 'do-not-use-bundler-for-tests (add-after 'unpack 'do-not-use-bundler-for-tests
(lambda _ (lambda _
(substitute* "spec/spec_helper.rb" (substitute* "spec/spec_helper.rb"
(("Bundler\\.setup.*") "")) (("Bundler\\.setup.*") ""))))
#t))
(add-after 'unpack 'relax-version-requirements (add-after 'unpack 'relax-version-requirements
(lambda _ (lambda _
(substitute* ((@@ (guix build ruby-build-system) first-gemspec)) (substitute* ((@@ (guix build ruby-build-system) first-gemspec))
@ -540,33 +539,30 @@ source files.")
(("\"rubocop\",.*") (("\"rubocop\",.*")
"'rubocop'\n") "'rubocop'\n")
(("\"parser\",.*") (("\"parser\",.*")
"'parser'\n")) "'parser'\n"))))
#t))
(add-after 'unpack 'patch-protoc (add-after 'unpack 'patch-protoc
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((protoc (assoc-ref inputs "protobuf"))) (substitute* "lib/protobuf/tasks/compile.rake"
(substitute* "lib/protobuf/tasks/compile.rake" (("\"protoc\"")
(("\"protoc\"") (string-append "\"" (search-input-file inputs "bin/protoc")
(string-append "\"" protoc "/bin/protoc" "\""))) "\"")))))
#t)))
(add-after 'unpack 'skip-failing-test (add-after 'unpack 'skip-failing-test
;; See: https://github.com/ruby-protobuf/protobuf/issues/419 ;; See: https://github.com/ruby-protobuf/protobuf/issues/419
(lambda _ (lambda _
(substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb" (substitute* "spec/lib/protobuf/rpc/connectors/ping_spec.rb"
(("expect\\(::IO\\)\\.to receive\\(:select\\).*" all) (("expect\\(::IO\\)\\.to receive\\(:select\\).*" all)
(string-append " pending\n" all))) (string-append " pending\n" all)))))
#t))
(add-after 'replace-git-ls-files 'replace-more-git-ls-files (add-after 'replace-git-ls-files 'replace-more-git-ls-files
(lambda _ (lambda _
(substitute* ((@@ (guix build ruby-build-system) first-gemspec)) (substitute* ((@@ (guix build ruby-build-system) first-gemspec))
(("`git ls-files -- \\{test,spec,features\\}/*`") (("`git ls-files -- \\{test,spec,features\\}/*`")
"`find test spec features -type f | sort`") "`find test spec features -type f | sort`")
(("`git ls-files -- bin/*`") (("`git ls-files -- bin/*`")
"`find bin -type f | sort`")) "`find bin -type f | sort`"))))
#t))
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(invoke "rspec")))))) (when tests?
(invoke "rspec")))))))
(native-inputs (native-inputs
(list ruby-benchmark-ips (list ruby-benchmark-ips
ruby-ffi-rzmq ruby-ffi-rzmq
@ -584,7 +580,10 @@ source files.")
(inputs (inputs
(list protobuf)) (list protobuf))
(propagated-inputs (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") (home-page "https://github.com/ruby-protobuf/protobuf")
(synopsis "Implementation of Google's Protocol Buffers in Ruby") (synopsis "Implementation of Google's Protocol Buffers in Ruby")
(description "Protobuf is an implementation of Google's Protocol Buffers (description "Protobuf is an implementation of Google's Protocol Buffers