Subject: [bug#64538] [PATCH 4/6] gnu: ruby-rbnacl: Use new package style.

From: gemmaro <[email-masked]>
Date: Sun, 9 Jul 2023 14:57:20 +0900

* gnu/packages/ruby.scm (ruby-rbnacl): Use new package style.
  [arguments]: Use gexp.
  [source, propagated-inputs, inputs, native-inputs]: Restyle format.
---
 gnu/packages/ruby.scm | 81 +++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 161218ba14..dd434efb52 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3166,50 +3166,47 @@ (define-public ruby-rbnacl
   (package
     (name "ruby-rbnacl")
     (version "7.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (rubygems-uri "rbnacl" version))
-       (sha256
-        (base32
-         "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk"))))
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "rbnacl" version))
+              (sha256
+               (base32
+                "0y8yzianlkc9w6sbqy8iy8l0yym0y6x7p5rjflkfixq76fqmhvzk"))))
     (build-system ruby-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-unnecessary-dependencies
-           (lambda _
-             ;; Coveralls relates to a network service, and Rubocop to code
-             ;; linting and both are unnecessary to run the tests
-             (substitute* "Gemfile"
-               ((".*rubocop.*") "\n")
-               ((".*guard-rspec.*") "\n")
-               ((".*coveralls.*") "\n"))
-             (substitute* "spec/spec_helper.rb"
-               (("require \"coveralls\"") "")
-               (("Coveralls.wear!") ""))
-             #t))
-         (add-after 'unpack 'use-libsodium-from-store
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("lib/rbnacl/init.rb"
-                            "lib/rbnacl/sodium.rb")
-               (("ffi_lib \\[.+\\]")
-                (string-append "ffi_lib [\""
-                               (assoc-ref inputs "libsodium") "/lib/libsodium.so"
-                               "\"]")))
-             #t))
-         ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "rspec"))
-             #t)))))
-    (propagated-inputs
-     (list ruby-ffi))
-    (inputs
-     (list libsodium))
-    (native-inputs
-     (list bundler ruby-rspec))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'remove-unnecessary-dependencies
+                          (lambda _
+                            ;; Coveralls relates to a network service, and Rubocop to code
+                            ;; linting and both are unnecessary to run the tests
+                            (substitute* "Gemfile"
+                              ((".*rubocop.*")
+                               "\n")
+                              ((".*guard-rspec.*")
+                               "\n")
+                              ((".*coveralls.*")
+                               "\n"))
+                            (substitute* "spec/spec_helper.rb"
+                              (("require \"coveralls\"")
+                               "")
+                              (("Coveralls.wear!")
+                               "")) #t))
+                        (add-after 'unpack 'use-libsodium-from-store
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            (substitute* '("lib/rbnacl/init.rb"
+                                           "lib/rbnacl/sodium.rb")
+                              (("ffi_lib \\[.+\\]")
+                               (string-append "ffi_lib [\""
+                                              (assoc-ref inputs "libsodium")
+                                              "/lib/libsodium.so" "\"]"))) #t))
+                        ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "rspec")) #t)))))
+    (propagated-inputs (list ruby-ffi))
+    (inputs (list libsodium))
+    (native-inputs (list bundler ruby-rspec))
     (synopsis "Ruby FFI binding to libsodium")
     (description
      "This package provides Ruby FFI bindings to the Networking and
-- 
2.41.0