From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Marusich Subject: bug#31088: Use '@' as version number separator in guix output Date: Tue, 08 May 2018 22:36:28 -0700 Message-ID: <87r2ml1jc3.fsf@gmail.com> References: <871sfr2bsg.fsf@gmail.com> <87k1tf5zxy.fsf@gmail.com> <877epegxsc.fsf@gmail.com> <874ljrnl3u.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGHmn-0007nC-Sr for bug-guix@gnu.org; Wed, 09 May 2018 01:37:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGHmj-0001EN-Q1 for bug-guix@gnu.org; Wed, 09 May 2018 01:37:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:46812) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGHmj-0001E4-MX for bug-guix@gnu.org; Wed, 09 May 2018 01:37:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fGHmh-0006UJ-86 for bug-guix@gnu.org; Wed, 09 May 2018 01:37:03 -0400 In-Reply-To: <871sfr2bsg.fsf@gmail.com> Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Message-ID: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Lirzin , Pierre Neidhardt Cc: 31088-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi everyone! I've committed this as ede121de426f9c56820852888a0b370f0ccbce49 on the master branch. If anything breaks on Hydra or elsewhere, please don't hesitate to revert it. ludo@gnu.org (Ludovic Court=C3=A8s) writes: >> diff --git a/NEWS b/NEWS >> index 2c898e65f..9769bfc87 100644 >> --- a/NEWS >> +++ b/NEWS >> @@ -777,6 +777,7 @@ zynaddsubfx@3.0.2 >>=20=20 >> ** Programming interfaces >>=20=20 >> +*** package-full-name (guix packages) now uses "@" instead of "-" as it= s delimiter. > > This is under =E2=80=9CChanges in 0.14.0 (since 0.13.0)=E2=80=9D, which i= s probably not > what you want. :-) Ah! Good catch. I've added a new section for 0.15.0 - which I'm sure will be released soon! ;-) >> +(define* (package-full-name package #:key (delimiter "@"))> > + "Return the full name of PACKAGE--i.e., `NAME@VERSION'. By specifying >> +DELIMITER (a string), you can customize what will appear between the na= me and >> +the version. By default, DELIMITER is \"@\"." > > I=E2=80=99d prefer #:optional instead of #:key, it=E2=80=99d be less verb= ose. Sounds good. I've implemented your suggestion. > Other than that, please make sure =E2=80=9Cmake check=E2=80=9D passes, an= d make sure > this doesn=E2=80=99t trigger a full rebuild (from the patch it looks you = already > checked both of these, but who knows ;-)). I've confirmed the following: 1) It builds, and "make check" passes [1]. 2) It does not trigger a full rebuild. I tested this by first invoking "./pre-inst-env guix system build gnu/system/examples/desktop.tmpl" before and after the change. 3) I reconfigured my own system a few days ago, too, using this change. So far, I have observed no problems. > OK with this. Thank you for the review! And thank you, Pierre, for reporting the bug! Footnotes:=20 [1] tests/guix-system.sh fails, but it was already failing on the master branch. I will open a bug report for that if there is not already one open. =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAlryiNwACgkQ3UCaFdgi Rp1tGRAAne+icVDKcC3S+w0+9Ibn5LCerQjGfiWPYWKybYUDp9eUvjyrJqxFIGv8 lTEyztYfDPp3aerE0NszivQgzGAV+CnAcL9dhc8UDX3AKYKj6FW5vb8VK4ktSy+j RSfuxwdmYM8jCb0ha4XSlA91dvsMvmf45Zc4cp3UoB2vN94c5CIMUPKtlve9ULaX sXG+eolp46bUAndX4obUMtQhO/YwC07dLdK66IIAx4wsgmySevJU5Bc74i+aK07E r5E3brQbRKOVrPS8luxXxCWbFi5YAGJYRzfvmbeC178Y1rivYbmPWmhKq7HSfqP1 8r/3vEwE4bHBrVApzOEY3+H5OgReeNL/BCQoTUNWIglMjXadbsayE3Sy2zh2CJJE EG7FXTBu+vprbSzpbLNtLoOVzo5u3PhZ7Kdim/64VLs4f9vkgOO7xASMRauoSCgv DjHJspP1uwMVgAh19OMyEvlrt54OSaszgvlY6k2yBCFerM4/UkFInzgMuCQVI8/O bDh9XmUDnQ7Xmn4MxH/7uDNoafxvhKzzSj0UcaspYEPs8ZbBBOJBIQpUOnORSCS+ Z/T8rbbiYX0wevetTrDTeULaErxqzlbHRCYTJw5hUrr46w5SIayj14ljqKu5w4sa Vy9/y0QleH2e/bZ1n3QtoN8pjK/QKjUw6ujySGkM324dBhN5Fd0= =GP6N -----END PGP SIGNATURE----- --=-=-=--