From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwDl9-0006QO-Fn for guix-patches@gnu.org; Tue, 19 Feb 2019 17:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwDl8-0006b8-NN for guix-patches@gnu.org; Tue, 19 Feb 2019 17:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwDl8-0006av-Hc for guix-patches@gnu.org; Tue, 19 Feb 2019 17:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gwDl8-0000kN-8h for guix-patches@gnu.org; Tue, 19 Feb 2019 17:21:02 -0500 Subject: [bug#34514] [PATCH 05/34] gnu: Add ruby-rbnacl. Resent-Message-ID: References: <87sgwm44a9.fsf@cbaines.net> <20190217192314.5666-1-mail@cbaines.net> <20190217192314.5666-5-mail@cbaines.net> <871s44ww78.fsf@elephly.net> From: Christopher Baines In-reply-to: <871s44ww78.fsf@elephly.net> Date: Tue, 19 Feb 2019 22:20:16 +0000 Message-ID: <87d0nnh13z.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 34514@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Christopher Baines 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 = 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!") "")))) > > Please end this phase with #T as substitute* has no defined return value. Ah, yes, I've tweaked the patch. >> + (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/lib= sodium.so" >> + "\""))))) > > Same here. > > This regexp looks brittle. Can we do without the =E2=80=9C18=E2=80=9D an= d =E2=80=9C23=E2=80=9D? Sure, I've replaced it by "ffi_lib \\[.+\\]". That should do the trick without being specific about the filenames. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlxsgSBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdLoQ//Vg+IlVrzPw/HCWDwIlWurOL7qkJ0ehTqmoGyYsZCFayFSBx6ce0Sltbd MK1KIt+wLOPukLtnFkBzXbWFVVsGYWMUna3SoDiS+0uCWsKpKVN60oxRdmLBjdDF UI/iYeiRWEu4MxPJH+eVCPlDcJD5I4nTCEcU9Ce1o6K0LaMsKsWaeg3ra7jaQhyO h/TrvrV4sFGDwZKjFP7pqPC7ldsa4g0My9tVsEwWG9ofDCiblWuF3CC9fASjMvWs +AT86Dik0VEOP98m55TOnN8YR05m8qK/rApyGJNsqdyz/zNbgGvDj7yeP6xLb4sn qZQnst8Q9B8r+FAK9W456oHUNI2dqS7LeBVsqKSLHqiRBfZIF2qRg++ULPtVgvVP HOo9Rdat6N8udaEsBe7l93EMB1COt9sXmnMG2nUTWqugccA6EdXLB2UYGIRiCzaN 0ae/NoxAkCJPrBTK3tgMQXMaI1yzn36WIzVWCMeg4KT3PMytu7x11GWMuxv1R0Sj yHzFGpWD9i+EwXgaL2I5LKGIEAUHNc1IixvNYDqGJl26DvSaCb+mAtnPydp3gcJJ jmUnlyl3pBaA1/I8h5T0wEk0lZ6as9eqvqh+iV95iiVVwVyhtUJU6DEjv+MI8ePW idyDyn67y8Rtj9jW8X0TSF9QukMnV3Kc0oXfo3AuV4s9oiotjn0= =ZkTZ -----END PGP SIGNATURE----- --=-=-=--