From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:37422)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gvrho-0001QW-Ai
	for guix-patches@gnu.org; Mon, 18 Feb 2019 17:48:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gvrhm-0002DG-F3
	for guix-patches@gnu.org; Mon, 18 Feb 2019 17:48:08 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:54115)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gvrhi-00029o-G0
	for guix-patches@gnu.org; Mon, 18 Feb 2019 17:48:04 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gvrhi-0002xu-Ab
	for guix-patches@gnu.org; Mon, 18 Feb 2019 17:48:02 -0500
Subject: [bug#34514] [PATCH 05/34] gnu: Add ruby-rbnacl.
Resent-Message-ID: <handler.34514.B34514.155053005011322@debbugs.gnu.org>
References: <87sgwm44a9.fsf@cbaines.net>
	<20190217192314.5666-1-mail@cbaines.net>
	<20190217192314.5666-5-mail@cbaines.net>
From: Ricardo Wurmus <rekado@elephly.net>
In-reply-to: <20190217192314.5666-5-mail@cbaines.net>
Date: Mon, 18 Feb 2019 23:47:23 +0100
Message-ID: <871s44ww78.fsf@elephly.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Christopher Baines <mail@cbaines.net>
Cc: 34514@debbugs.gnu.org


Christopher Baines <mail@cbaines.net> writes:

> * gnu/packages/ruby.scm (ruby-rbnacl): New variable.
[=E2=80=A6]
> +         (add-after 'unpack 'remove-unnecessary-dependencies
> +           (lambda _
> +             ;; Coveralls relates to a network service, and Rubocop to c=
ode
> +             ;; 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!") ""))))

Please end this phase with #T as substitute* has no defined return value.

> +         (add-after 'unpack 'use-libsodium-from-store
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* '("lib/rbnacl/init.rb"
> +                            "lib/rbnacl/sodium.rb")
> +               (("\"sodium\", \"libsodium\\.so\\.18\", \"libsodium\\.so\=
\.23\"")
> +                (string-append "\""
> +                               (assoc-ref inputs "libsodium") "/lib/libs=
odium.so"
> +                               "\"")))))

Same here.

This regexp looks brittle.  Can we do without the =E2=80=9C18=E2=80=9D and =
=E2=80=9C23=E2=80=9D?

--=20
Ricardo