From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 05 03:59:45 2020 Received: (at submit) by debbugs.gnu.org; 5 Jul 2020 07:59:45 +0000 Received: from localhost ([127.0.0.1]:59968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrzYv-0007bI-Ix for submit@debbugs.gnu.org; Sun, 05 Jul 2020 03:59:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:48110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrzYt-0007bB-Qg for submit@debbugs.gnu.org; Sun, 05 Jul 2020 03:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrzYt-0002ZF-Hm for bug-guix@gnu.org; Sun, 05 Jul 2020 03:59:43 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:53512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrzYq-00073T-1T for bug-guix@gnu.org; Sun, 05 Jul 2020 03:59:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QMpTdF/d5jCy9BEiTS7vmEPS40+IxePRHHx6zvor1lI=; b=BlekCby/l/wfsaomBA6SbqdsBU h53DpnlPqvgeaFESmCWwyNLWs4GHSdSQSSl9fndf9JSeklN08svC2ywVwMFeUNahgKaKMPhSmLzPx lDKtjbWWtwMe5eMJkNYr+emMG7LH2QObA7bqwBkeNf8S67pX6W8/46eRAvwyiAAMAX7U=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jrzYj-000FfZ-LG for bug-guix@gnu.org; Sun, 05 Jul 2020 13:29:34 +0530 From: Arun Isaac To: bug-guix@gnu.org Subject: Guix version rendered as 0.0-git in info manual Date: Sun, 05 Jul 2020 13:29:23 +0530 Message-ID: <877dviv1d0.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/05 03:59:35 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain In the info manual, the Guix version is rendered as 0.0-git. For example, in "(guix) The Store", see "The ability to connect to remote build daemons is considered experimental as of 0.0-git". I am running the Guix standalone system. Any idea what's going wrong? Thanks, Arun --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl8BiF4ACgkQLiXui2GA K7MnsAgAiI974Rx8d1/zY013tfam96NoHc/3d/+5t9UHbYU2LW9uBPtI04v4PIVq p+nmtbqlxf2zD4KBEiWueDb2rD9cWKUat4xyAfvEq9t/JgCytkFt2vQvkEvsWGUC q8tLp/UbQxOxXx0lfVxXwptvP0gnt6eWzYfRsCXSWs1lS3/HennJbBMKbMEWEBTl KE/pA+p9Ftgb2QgiYf1MsnfdkgPC3KH3Ah8CFKhsUcRIpsCPs2SL2mhCtzXkUmjL HsdGB+8lAbrOTZMprPonIokA+ZN7dpXDXfceQBv2R6tjMiZIh5vH8gLwSwC1O6sH PAMdUcPEJBpSHIql/Ysw5jRwMqwglA== =bNkq -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 09 18:29:52 2020 Received: (at 42212) by debbugs.gnu.org; 9 Jul 2020 22:29:52 +0000 Received: from localhost ([127.0.0.1]:41844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtf3A-0000DF-91 for submit@debbugs.gnu.org; Thu, 09 Jul 2020 18:29:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtf37-0000D1-H7 for 42212@debbugs.gnu.org; Thu, 09 Jul 2020 18:29:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37835) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtf2z-0006Pc-Uj; Thu, 09 Jul 2020 18:29:41 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35960 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jtf2y-0003fC-Fg; Thu, 09 Jul 2020 18:29:41 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual References: <877dviv1d0.fsf@systemreboot.net> Date: Fri, 10 Jul 2020 00:29:39 +0200 In-Reply-To: <877dviv1d0.fsf@systemreboot.net> (Arun Isaac's message of "Sun, 05 Jul 2020 13:29:23 +0530") Message-ID: <878sfs9vak.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42212 Cc: 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Arun, Arun Isaac skribis: > In the info manual, the Guix version is rendered as 0.0-git. For > example, in "(guix) The Store", see "The ability to connect to remote > build daemons is considered experimental as of 0.0-git". I am running > the Guix standalone system. Any idea what's going wrong? Nothing! :-) The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted ther= e, we can=E2=80=99t really afford to change the version string at each commit, or we=E2=80=99d = have to rebuild the manual at each commit. We could perhaps choose a more meaningful version string, though, maybe by looking at the closest tag or something. Thoughts? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 15 17:42:48 2020 Received: (at 42212) by debbugs.gnu.org; 15 Jul 2020 21:42:48 +0000 Received: from localhost ([127.0.0.1]:53787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvpAt-0004yC-Tg for submit@debbugs.gnu.org; Wed, 15 Jul 2020 17:42:48 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvpAo-0004y0-1S for 42212@debbugs.gnu.org; Wed, 15 Jul 2020 17:42:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+qnP445Vw/HpcGnd9srRsKw/j0RZMr8it9e/GpHy5bA=; b=kw+C5dMykn4hFdC5pIuNV/QOj XjI13dERLh7J89wbgWS2vd7baF0GXVLA/K7YRn45eaz1ZoSeVerpf5ZaysnQ8QNUarhqtcRGO5foh N7bl65d9i4UpD7LxuX1qV5cYc21oxasJ3idE4YkjTpR7nX4lrI8uWk/X4VjMO5WiHbxQU=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jvpAk-00115m-8E; Thu, 16 Jul 2020 03:12:38 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual In-Reply-To: <878sfs9vak.fsf@gnu.org> References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> Date: Thu, 16 Jul 2020 03:12:37 +0530 Message-ID: <871rlczc8i.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted th= ere, we can=E2=80=99t > really afford to change the version string at each commit, or we=E2=80=99= d have > to rebuild the manual at each commit. > > We could perhaps choose a more meaningful version string, though, maybe > by looking at the closest tag or something. That sounds good, and `git describe` could provide us with the closest tag. Unfortunately, (git) doesn't seem to be available during `guix pull`. I'm trying to come up with workarounds. Do you have any ideas? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl8PeE0ACgkQLiXui2GA K7NcEQf+PRJ3V00qNk2xvwI+YxaYQTmphSAXwgqwjY6kuy5/UHQ63NyviUf6rmvt 5hmcyE148NL2EaRFgzbkNSvczIdmYoAFYeIijsAsQm2toNL9Sr06bRIbrVeE4pwW BBaAMr4V3sqBy6akjfd3ffh4IcbZMbiK/pKOcg87z+b7u++YYq3gKUvXqoXqT/+T ulmTRkkKEuT/LzsQKAgVDwSgnLMEWIPorkTS9krgmDI2hYjSrdn9u1rDEn39o/8N 8SqkWDK58XbiAW6kqes5bQzsIm+Q4wEPALcq728NWRrz5hceRYXrG+3YLghwI8Un S5CzNKqnuED6attEqcjSB2DHwSqVuw== =6RFp -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 15 19:27:26 2020 Received: (at 42212) by debbugs.gnu.org; 15 Jul 2020 23:27:26 +0000 Received: from localhost ([127.0.0.1]:54077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvqnv-0007W5-EW for submit@debbugs.gnu.org; Wed, 15 Jul 2020 19:27:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvqnt-0007Vs-Bq for 42212@debbugs.gnu.org; Wed, 15 Jul 2020 19:27:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38601) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvqnm-0004qy-Nl; Wed, 15 Jul 2020 19:27:02 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49706 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jvqnl-00055e-HG; Wed, 15 Jul 2020 19:27:02 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <871rlczc8i.fsf@systemreboot.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 Messidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 16 Jul 2020 01:26:59 +0200 In-Reply-To: <871rlczc8i.fsf@systemreboot.net> (Arun Isaac's message of "Thu, 16 Jul 2020 03:12:37 +0530") Message-ID: <87tuy8741o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42212 Cc: 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Arun Isaac skribis: >> The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted t= here, we can=E2=80=99t >> really afford to change the version string at each commit, or we=E2=80= =99d have >> to rebuild the manual at each commit. >> >> We could perhaps choose a more meaningful version string, though, maybe >> by looking at the closest tag or something. > > That sounds good, and `git describe` could provide us with the closest > tag. Unfortunately, (git) doesn't seem to be available during `guix > pull`. I'm trying to come up with workarounds. Do you have any ideas? I=E2=80=99m not sure exactly. (guix self) receives a commit ID as #:version (though it doesn=E2=80=99t have to; it can be a random string too, as in =E2=80=98build-aux/compile-as-derivation.scm=E2=80=99). Maybe when (guix channels) =E2=80=98build-from-source=E2=80=99 invokes =E2= =80=98build=E2=80=99, it could pass it an optional short version identifier guaranteed to rarely change. (There=E2=80=99s a (git describe) module in Guile-Git that might be helpful.) That version identifier must then be passed from =E2=80=98build-aux/build-self.scm=E2=80=99 all the way to =E2=80=98info-man= ual=E2=80=99 in (guix self). Thoughts? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 15 20:46:15 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 00:46:15 +0000 Received: from localhost ([127.0.0.1]:54193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvs2R-0000xt-Fq for submit@debbugs.gnu.org; Wed, 15 Jul 2020 20:46:15 -0400 Received: from imta-35.everyone.net ([216.200.145.35]:57144 helo=imta-38.everyone.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvs2O-0000xc-WB for 42212@debbugs.gnu.org; Wed, 15 Jul 2020 20:46:14 -0400 Received: from pps.filterd (m0004961.ppops.net [127.0.0.1]) by imta-38.everyone.net (8.16.0.27/8.16.0.27) with SMTP id 06G0jMjt023445; Wed, 15 Jul 2020 17:46:11 -0700 X-Eon-Originating-Account: NHj8NyL5X0nbDyVifeNqQbQxVi5HnKmtUWXW0bNJOzg X-Eon-Dm: m0116787.ppops.net Received: by m0116787.mta.everyone.net (EON-AUTHRELAY2 - 5a81c095) id m0116787.5ef25212.234ee0; Wed, 15 Jul 2020 17:46:10 -0700 X-Eon-Sig: AQMHrIJfD6NSB+BShQIAAAAE,1d21541888facce8eb905eb5d9d5be1c X-Eip: DiViWVy2spgloeLObqbFcO8eSjY-1hepweWJ9dzDkJE Date: Thu, 16 Jul 2020 02:46:00 +0200 From: Bengt Richter To: Arun Isaac Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual Message-ID: <20200716004600.GA3021@LionPure> References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <871rlczc8i.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <871rlczc8i.fsf@systemreboot.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-15_12:2020-07-15, 2020-07-15 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2006250000 definitions=main-2007160003 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42212 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Bengt Richter Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On +2020-07-16 03:12:37 +0530, Arun Isaac wrote: > > > The “0.0-git” string comes from (guix self). As noted there, we can’t > > really afford to change the version string at each commit, or we’d have > > to rebuild the manual at each commit. > > > > We could perhaps choose a more meaningful version string, though, maybe > > by looking at the closest tag or something. > > That sounds good, and `git describe` could provide us with the closest > tag. Unfortunately, (git) doesn't seem to be available during `guix > pull`. I'm trying to come up with workarounds. Do you have any ideas? What does (copied from another laptop screen by hand, typos possible ;) --8<---------------cut here---------------start------------->8--- readlink -f /var/guix/profiles/per-user/{$USER,root}/current-guix/manifest|xargs grep -m1 -A1 guix --8<---------------cut here---------------end--------------->8--- get you? Anything useful? On my other laptop, it got me (again copied/...elided from other screen) --8<---------------cut here---------------start------------->8--- /gnu/store/.../manifest: (("guix" /gnu/store/.../manifest- "87850c0" -- /gnu/store/.../manifest: (("guix" /gnu/store/.../manifest- "0.16.0" --8<---------------cut here---------------end--------------->8--- You can see that's ancient, so IDK if the same command will work for you. "guix -V" there still shows 0.16.0 (which version should that show, BTW?) I don't know how these versions correspond to what pull creates, but zimoun is a whiz on that stuff, so maybe he will chime in :) (I Cc'd him to raise the probability :) HTH -- Regards, Bengt Richter From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 01:09:02 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 05:09:03 +0000 Received: from localhost ([127.0.0.1]:54312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvw8k-0007Dp-Kb for submit@debbugs.gnu.org; Thu, 16 Jul 2020 01:09:02 -0400 Received: from imta-36.everyone.net ([216.200.145.36]:47000 helo=imta-38.everyone.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvw8f-0007DN-R7 for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 01:09:01 -0400 Received: from pps.filterd (omta002.sj2.proofpoint.com [127.0.0.1]) by imta-38.everyone.net (8.16.0.27/8.16.0.27) with SMTP id 06G51bPG022327; Wed, 15 Jul 2020 22:08:56 -0700 X-Eon-Originating-Account: TbbZ0FSv9Cirt-nB9TVMQKN0Ce3zfoSVxYxEQ1Sce98 X-Eon-Dm: m0116953.ppops.net Received: by m0116953.mta.everyone.net (EON-AUTHRELAY2 - 5a81c095) id m0116953.5ef25221.25f52d; Wed, 15 Jul 2020 22:08:52 -0700 X-Eon-Sig: AQMHrIJfD+Dk5geSKwIAAAAC,9850255a188c22e46c858e0dc93696b5 X-Eip: B468WPbA9RVufLPwKxnDGThFTWTZ98EFW3Sh62l-JKo Date: Thu, 16 Jul 2020 07:08:42 +0200 From: Bengt Richter To: Arun Isaac Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual Message-ID: <20200716050842.GA3527@LionPure> References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <871rlczc8i.fsf@systemreboot.net> <20200716004600.GA3021@LionPure> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200716004600.GA3021@LionPure> User-Agent: Mutt/1.10.1 (2018-07-13) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-15_12:2020-07-15, 2020-07-15 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2006250000 definitions=main-2007160038 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42212 Cc: 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Bengt Richter Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On +2020-07-16 02:46:00 +0200, Bengt Richter wrote: > On +2020-07-16 03:12:37 +0530, Arun Isaac wrote: > > > > > The “0.0-git” string comes from (guix self). As noted there, we can’t > > > really afford to change the version string at each commit, or we’d have > > > to rebuild the manual at each commit. > > > > > > We could perhaps choose a more meaningful version string, though, maybe > > > by looking at the closest tag or something. > > > > That sounds good, and `git describe` could provide us with the closest > > tag. Unfortunately, (git) doesn't seem to be available during `guix > > pull`. I'm trying to come up with workarounds. Do you have any ideas? > > What does (copied from another laptop screen by hand, typos possible ;) > --8<---------------cut here---------------start------------->8--- > readlink -f /var/guix/profiles/per-user/{$USER,root}/current-guix/manifest|xargs grep -m1 -A1 guix > --8<---------------cut here---------------end--------------->8--- > get you? Anything useful? > > On my other laptop, it got me (again copied/...elided from other screen) > --8<---------------cut here---------------start------------->8--- > /gnu/store/.../manifest: (("guix" > /gnu/store/.../manifest- "87850c0" > -- > /gnu/store/.../manifest: (("guix" > /gnu/store/.../manifest- "0.16.0" > --8<---------------cut here---------------end--------------->8--- > > You can see that's ancient, so IDK if the same command will work for you. > "guix -V" there still shows 0.16.0 (which version should that show, BTW?) > > I don't know how these versions correspond to what pull creates, > but zimoun is a whiz on that stuff, so maybe he will chime in :) > (I Cc'd him to raise the probability :) Sorry, I seem not to have succeeded with the Cc: to zimoun Or it's been scrubbed out of the headers. Ah, do I faintly remember that one needs a special incantation? Sorry, I will look into it. > > HTH > -- > Regards, > Bengt Richter > > > -- Regards, Bengt Richter From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 05:37:36 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 09:37:36 +0000 Received: from localhost ([127.0.0.1]:54617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0Ke-0005e7-0D for submit@debbugs.gnu.org; Thu, 16 Jul 2020 05:37:36 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0Kb-0005dq-3U for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 05:37:34 -0400 Received: by mail-wr1-f67.google.com with SMTP id f18so6384408wrs.0 for <42212@debbugs.gnu.org>; Thu, 16 Jul 2020 02:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=p7AfdhhIelxDvec9g8+IAKVs/aKPGDhnF2EH8oqh6hA=; b=EtYpt6XY3q3Qh8FTjf1E+exUakdhRrAiaurhNLP5uGsbVcou7xe01n9elV3wEZd3WN oi5AFx6yiHL83IBLbucKmSJ1ZXAX9NvO93ao4jphC5dyTCNecGLSov3z+G2AJsPnAh8C IEmkWHhJP3AS+FMCtTrs0xDhB6+mFGfDKm7i5VbEcybft5wCJU5rRISSMUfSuMSd3syy seMJvQbaP02aS7ODnAflcJ9W7HiPmrYwEoLE7b8Bd2UUvqAaPvKRFF6DuO5c/j0/zqAy X1KkRErCi5WBut4HjhGvlMtZSpvBiFccLY+0Mx+IfxTofCKO7MVemmnhViDYpq9PItdj 9nbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=p7AfdhhIelxDvec9g8+IAKVs/aKPGDhnF2EH8oqh6hA=; b=moHvBYRIEaWzNNDNlKkJmGnH4Zw/D1B55EpCIkiW7BGBG5Z42pVNOMAxpcoW0p7KyO nRMRL6caObe9ZR03dLpqaSeOw+zN5EiZ/Fta3/vlYTqC47uSSp7tbtT7U1IQhKMfDWvK fhg9qBD8FBZNn98WzXprhcrI/bBGlepi+9Hjb/FyxHkKhUxG3N7ImA05THJc+3sgHZuY Hqhn2Mku/MoXpEembLi2Y2tlCWP1qGmwoL+hMHuoWWk40/CoIdpvDY+wDEnFNZMkQfoa mi5Tamb0I9vSnDDXUvPVBMhyBBZiKCYZPKFKLAjpf8W31Yb8mXs6vdGD2YIiFKpYaPqb YvIg== X-Gm-Message-State: AOAM530CaoczbWZfnSrxC/7gzMf0Cq4PATLI2+JJ7Z1NrdFbFeb/ylA0 C+r1WtOlOB9YKlJXgrrvvqKON+SF X-Google-Smtp-Source: ABdhPJz5Mcua2/ki0PVjcrvSCuZtp2bHgR2hMslIghP/cLm3EXnDCFxJP07v++QQzqS6tV5UiuVA9Q== X-Received: by 2002:adf:ea06:: with SMTP id q6mr4041723wrm.69.1594892246964; Thu, 16 Jul 2020 02:37:26 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id a12sm8240182wrv.41.2020.07.16.02.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 02:37:26 -0700 (PDT) From: zimoun To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> Date: Thu, 16 Jul 2020 11:37:25 +0200 In-Reply-To: <878sfs9vak.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 10 Jul 2020 00:29:39 +0200") Message-ID: <86lfjjztpm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Fri, 10 Jul 2020 at 00:29, Ludovic Court=C3=A8s wrote: > Arun Isaac skribis: > >> In the info manual, the Guix version is rendered as 0.0-git. For >> example, in "(guix) The Store", see "The ability to connect to remote >> build daemons is considered experimental as of 0.0-git". I am running >> the Guix standalone system. Any idea what's going wrong? > > Nothing! :-) > > The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted th= ere, we can=E2=80=99t > really afford to change the version string at each commit, or we=E2=80=99= d have > to rebuild the manual at each commit. Why is it an issue if the manual is substituted? > We could perhaps choose a more meaningful version string, though, maybe > by looking at the closest tag or something. For example, when I pull I have something like: /gnu/store/=E2=80=A6-guix-1b2141743-modules.drv so why this commit ID could not be reused in the manual? For example, the devel version of the manual contains the commit ID, see [1]. 1: https://guix.gnu.org/manual/devel/en/guix.html#The-Store All the best, simon ps: Sorry Ludo for the double sending, I missed the "reply all". From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 05:48:39 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 09:48:39 +0000 Received: from localhost ([127.0.0.1]:54625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0VL-0005uD-9n for submit@debbugs.gnu.org; Thu, 16 Jul 2020 05:48:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0VJ-0005u0-5r for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 05:48:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45754) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jw0VC-0005we-IZ; Thu, 16 Jul 2020 05:48:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=50126 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jw0VB-0000HE-2W; Thu, 16 Jul 2020 05:48:29 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: zimoun Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <86lfjjztpm.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 Messidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 16 Jul 2020 11:48:26 +0200 In-Reply-To: <86lfjjztpm.fsf@gmail.com> (zimoun's message of "Thu, 16 Jul 2020 11:37:25 +0200") Message-ID: <87imen7pud.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, zimoun skribis: > On Fri, 10 Jul 2020 at 00:29, Ludovic Court=C3=A8s wrote: >> Arun Isaac skribis: >> >>> In the info manual, the Guix version is rendered as 0.0-git. For >>> example, in "(guix) The Store", see "The ability to connect to remote >>> build daemons is considered experimental as of 0.0-git". I am running >>> the Guix standalone system. Any idea what's going wrong? >> >> Nothing! :-) >> >> The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted t= here, we can=E2=80=99t >> really afford to change the version string at each commit, or we=E2=80= =99d have >> to rebuild the manual at each commit. > > Why is it an issue if the manual is substituted? If it has to be rebuilt at every commit, chances are you won=E2=80=99t get substitutes because it has to be built on the build farm, too. :-) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 06:07:06 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 10:07:06 +0000 Received: from localhost ([127.0.0.1]:54644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0nC-0006M9-AB for submit@debbugs.gnu.org; Thu, 16 Jul 2020 06:07:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0nA-0006Le-1s for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 06:07:05 -0400 Received: by mail-wm1-f68.google.com with SMTP id o8so9737651wmh.4 for <42212@debbugs.gnu.org>; Thu, 16 Jul 2020 03:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=E0x4Qc8ccwiVmOynBTDHgfQBpu0l6pdA/aJVl+CWlZE=; b=JYlyYWdxi74wYjl+oJEoHBJ5xF43EQLjvglcwRCrpmM+cI5iK+JliDG/7dfyOCQsqu 1kHRDHjysQRUc3phzK7cufFiN/OVkERfbwVGuPOwbOE7szC4d2BJ8pdeKAiqwSFLSszJ 4li+pfT58TwnilG4MhNIZtbSBM07ViyyhPL9UBNNy/Pi/dETvbNcx6ow5wgT63XXa8gf OvxSEP6GXQKLR6iYaWjMpBXpfuMEdsmAp3kdDZxR5I5Q8/7c8hzo/8LtDcOieFW465lf UHPOGmywvqoGM8ump9Z+jLdYCmYGTjNIj+fQdcRMVp0zZMNwuBFU0/lxOz6jZVx2q4y7 LP6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=E0x4Qc8ccwiVmOynBTDHgfQBpu0l6pdA/aJVl+CWlZE=; b=mZjcJMyabIZ9c5IwxVXudWYuyEHO0wj9Jx+Tlptvk6wC9/HW0SWX932gPB7l7+iqdm Z2yPeOyr4uURErlDhNHKHen/O+SnYpNy9jtxZCSWquLYVevBcUQZ0AZU1a6I2/rGrVB1 s3sIQvlHpnug0l1eNRcgwHopmG1ADQ4a8ZNBZmZALrjGFPi8Hcw+Bhr2rUclt/VBVJcx deCuqaCX4HrcKD/n9MgNVNcdoHeHSbXxut/AGccE5RmGFhtiNRxiDoG3ik0WysoX63kC Lwo4uQjqmfBL/5SmQygJpKRS96aV2YD3s8HStu8VWVE3GQPxlA5jD0mcGDLLY7wbqTwI Bv8Q== X-Gm-Message-State: AOAM530AQU0wO0m02irzwIJeFVT/DErp3AG5Nf5wwkfsZnVpzLKBcHQb LTyriazhbWx8lWCx1qwFBblDJ5hV X-Google-Smtp-Source: ABdhPJwlGoT6u9t+3Dy4a0cmE8FPJ8Em4wGyuya5GMSFqJTYsEClPpvAjrsXligcvNsqBmS9/mSCfQ== X-Received: by 2002:a05:600c:21ca:: with SMTP id x10mr3628197wmj.63.1594894017709; Thu, 16 Jul 2020 03:06:57 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id b18sm8428261wrs.46.2020.07.16.03.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 03:06:57 -0700 (PDT) From: zimoun To: Bengt Richter Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <871rlczc8i.fsf@systemreboot.net> <20200716004600.GA3021@LionPure> Date: Thu, 16 Jul 2020 12:06:55 +0200 In-Reply-To: <20200716004600.GA3021@LionPure> (Bengt Richter's message of "Thu, 16 Jul 2020 02:46:00 +0200") Message-ID: <86eepbzscg.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear Bengt, On Thu, 16 Jul 2020 at 02:46, Bengt Richter wrote: > readlink -f /var/guix/profiles/per-user/{$USER,root}/current-guix/manifes= t|xargs grep -m1 -A1 guix > > get you? Anything useful? I am not sure the issue is to get the commit identifier. :-) Otherwise, the Guix schemish way is something like: --8<---------------cut here---------------start------------->8--- (use-modules (ice-9 match) (srfi srfi-1) ((guix describe) #:select (current-profile)) ((guix config) #:select (%guix-version)) (guix channels)) (match (current-profile) (#f %guix-version) ;for lack of a better ID (profile (let ((channel (find guix-channel? (profile-channels profile)))) (channel-commit channel)))) --8<---------------cut here---------------end--------------->8--- (From a Ludo=E2=80=99s hint for the last sources.json patch. :-)) All the best, simon From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 06:19:46 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 10:19:46 +0000 Received: from localhost ([127.0.0.1]:54665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0zS-0006eu-Kj for submit@debbugs.gnu.org; Thu, 16 Jul 2020 06:19:46 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:37102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw0zQ-0006eh-8t for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 06:19:45 -0400 Received: by mail-wr1-f43.google.com with SMTP id a6so6487705wrm.4 for <42212@debbugs.gnu.org>; Thu, 16 Jul 2020 03:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=Ul80CDbLwKsJMA5OgkLmZ0BVpNSI6Cqgl9qLwJNwbyU=; b=j0XHsJv5F5CP8SkucL9dQjGn0fQ9jwZvtHN20NPM4Z/tRFAyNrpFtb51TiGswKIrr7 uho33WDrElfoWDGnHa1Tx+WmC1ii/rEPZI1DFsjChzFTuYpYhUxbwfHkc5YZvhfyZwfn ZOb2/wzkzSXh25BsE9LtFjgdzBezm9nXx0dhwGlMQlvloBWAYHw7NN2WnfILRrD8Lxyp keecxCBSqoiYxGKkpsp3yJQfnMmk9BLibhynSWy8aQD9IUnoHgbPKmvAazcnUEclzaO1 tFSTCexT0nBt/b2i0eVnVX+21ggY44N2ERSBoGhxao5l/FRzrJPt9WC5T34IQrO8K/ic vmpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=Ul80CDbLwKsJMA5OgkLmZ0BVpNSI6Cqgl9qLwJNwbyU=; b=fj0ADtLvcxgKmyK14o7sV8Hy6nnEf9wOAhZ87wNRsfmTaCphRTbkmaOQbzMoUREIUf vgU/vKMCgqWMjr1M6CCjQIDRbz2ltEfEdgbdMxovB40Ft6ysmYXd63XcpNCjRAzwt/Bk B+4GN2nPLYiZC2M+nu+tMicrxbPeR4viYN4rpoHiqgpEhT/z0WhNdh7Ij02n/ZfG0Os7 rz3dTs3J8a7KVh+RqwhvDoUdz/CFY/f9/1pU1KF/U1fV8cb51X+WawAfVHgh+rTWCYpM t6Q6V17VWKd/+ObP+nl7T4v2lITYNcx9MXJ+u/YkCej+Ymflp61dJAdSFU52UceF4t8a oVxw== X-Gm-Message-State: AOAM530JZfmAJtDFuVy0Ht4FoDOlANe8wQvTcTc2Fvt4Xv4BgWQyAxYZ bbBheWQzCo+4Dskm+/NO2TjuquNJ X-Google-Smtp-Source: ABdhPJz3peQ9cVt1jhcFs3osx/q1/NJmx2My0ny1vAkkrMGF2znya96wpJHkMlEN4fi9GR8r9q+dDA== X-Received: by 2002:adf:8501:: with SMTP id 1mr4737406wrh.153.1594894777992; Thu, 16 Jul 2020 03:19:37 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id m16sm8004374wro.0.2020.07.16.03.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 03:19:37 -0700 (PDT) From: zimoun To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual In-Reply-To: <87imen7pud.fsf@gnu.org> References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> <86lfjjztpm.fsf@gmail.com> <87imen7pud.fsf@gnu.org> Date: Thu, 16 Jul 2020 12:19:36 +0200 Message-ID: <86blkfzrrb.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Thu, 16 Jul 2020 at 11:48, Ludovic Court=C3=A8s wrote: >>> The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted = there, we can=E2=80=99t >>> really afford to change the version string at each commit, or we=E2=80= =99d have >>> to rebuild the manual at each commit. >> >> Why is it an issue if the manual is substituted? > > If it has to be rebuilt at every commit, chances are you won=E2=80=99t get > substitutes because it has to be built on the build farm, too. :-) How Guix distinguish between "doc commit" and other commit? I mean, is it not the latest Guix manual that "guix pull" pulls? With which guarantee / confidence? BTW, as discussed elsewhere, it should not be possible to pull non substituable commits by default, in the meaning: commit for which the outputs are not already built by the build farm. Well, put again on the table CI as in [1] for a recent "again". :-) 1: https://lists.gnu.org/archive/html/guix-devel/2020-07/msg00074.html Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 16 15:37:10 2020 Received: (at 42212) by debbugs.gnu.org; 16 Jul 2020 19:37:10 +0000 Received: from localhost ([127.0.0.1]:56049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw9gs-00062z-CF for submit@debbugs.gnu.org; Thu, 16 Jul 2020 15:37:10 -0400 Received: from flashner.co.il ([178.62.234.194]:37978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw9gp-00062k-VP for 42212@debbugs.gnu.org; Thu, 16 Jul 2020 15:37:08 -0400 Received: from localhost (unknown [141.226.9.208]) by flashner.co.il (Postfix) with ESMTPSA id D2528400D1; Thu, 16 Jul 2020 19:37:01 +0000 (UTC) Date: Thu, 16 Jul 2020 22:36:29 +0300 From: Efraim Flashner To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#42212: Guix version rendered as 0.0-git in info manual Message-ID: <20200716193629.GJ10256@E5400> References: <877dviv1d0.fsf@systemreboot.net> <878sfs9vak.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="HcccYpVZDxQ8hzPO" Content-Disposition: inline In-Reply-To: <878sfs9vak.fsf@gnu.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --HcccYpVZDxQ8hzPO Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 10, 2020 at 12:29:39AM +0200, Ludovic Court=C3=A8s wrote: > Hi Arun, >=20 > Arun Isaac skribis: >=20 > > In the info manual, the Guix version is rendered as 0.0-git. For > > example, in "(guix) The Store", see "The ability to connect to remote > > build daemons is considered experimental as of 0.0-git". I am running > > the Guix standalone system. Any idea what's going wrong? >=20 > Nothing! :-) >=20 > The =E2=80=9C0.0-git=E2=80=9D string comes from (guix self). As noted th= ere, we can=E2=80=99t > really afford to change the version string at each commit, or we=E2=80=99= d have > to rebuild the manual at each commit. >=20 > We could perhaps choose a more meaningful version string, though, maybe > by looking at the closest tag or something. >=20 > Thoughts? >=20 I looked into it a bit for my os-release file. $ guile -L /path/to/checkout (ins)scheme@(guile-user)> (use-modules ((guix config))) (ins)scheme@(guile-user)> %guix-version $1 =3D "1.0.1.19582-d7e9e" $ guile -L ~/.cache/guix/pull/pjmkglp4t7znuugeurpurzikxq3tnlaywmisyr27shj7a= psnalwq/ (ins)scheme@(guile-user)> (use-modules ((guix config))) (ins)scheme@(guile-user)> %guix-version $1 =3D "1.1.0-17.36a1925" it seems to me that (guix config) could work --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --HcccYpVZDxQ8hzPO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl8QrDoACgkQQarn3Mo9 g1GpohAAr8Awujfha3JKucAgotFzbi0HB1cuDI1v5Q+7c5fF/OFepZS/QsoDCgxO zvgtfAq2fPSu9t8yIrO8ytqruRDvbrmM/uz36Pq201R2EK4txz9QILoaP5OdhkME c0S27efDgSsp+JLZxnTB7QzRbmOq5SvbBc/P4dOWr862zrk3ROAimfxz/PGeSqr6 ls+NfDs35wcv5W5sA5T3xI0WY9SekcUeKeopo3eSjZEmTzwJGya258XHse/X9UBe E9/Pf7Q9MitRmyEgS4VJxudAxQjKtBJwM3QAd79QWAFMEYV1WZQmQSWcaWsyCiCy gYOrTu+Y2CkASuDEtQb6aPPcWPkVeNaoGMXOwSXAlYBRqGycOh7HAhi+bUxXM1FB 1bpYnkwTzrYqKpmtiOUbWRPwgvBqMwth8eBlyYS9YmY79fMmvuC32WH1/OlXdTua 1C1D2RNs17Lx+2mYmXbyte8glDMVzDL2od/C1IE78Dh98y7VxyUK2fBdVfqKT1qE JR3xyIe/nS/ajSwx2abreHtD1UasJK2zirbqtA2tJbwrZO5h+Rz2aJ0P7Y6ajVGx iEbjGVNHmWzpJpwIKDs6Q+2UWaivaaXlrO7pAJxsKPHUZAggs0NVf3FfEWngLrBQ UvLzGgrdQ9dLaALB8mrNWfrHtV/En30Q/onlar+wEYf2Wv60qiM= =Lc88 -----END PGP SIGNATURE----- --HcccYpVZDxQ8hzPO-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 17 19:55:29 2020 Received: (at 42212) by debbugs.gnu.org; 17 Jul 2020 23:55:29 +0000 Received: from localhost ([127.0.0.1]:58154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwaCP-0001VR-37 for submit@debbugs.gnu.org; Fri, 17 Jul 2020 19:55:29 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwaCL-0001VA-1o for 42212@debbugs.gnu.org; Fri, 17 Jul 2020 19:55:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q+IcVA60kHVctc8VEa669RL6PxAiFCpxucLMuDdxuh0=; b=ZyINDhNqpZefmNJEEl3JR9QjKY w//ZNZj8DKsGu20ok1vra+H0TGeYtsMCRw6uYkGkT2ogkpqtpmdu1X0i3kJvpjnuCXYeEoVqScC2Z GGKKTUVbGbO7O8xqR0732Yqf16ZpTRk+EjD0rAgGFqR78RgHzpMrd2o92NQuC0VV+bbQ=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jwaC1-0015Vr-26; Sat, 18 Jul 2020 05:25:05 +0530 From: Arun Isaac To: Efraim Flashner , =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 0/1] Use nearest tag as the version string in documentation. Date: Sat, 18 Jul 2020 05:25:02 +0530 Message-Id: <20200717235503.19809-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200716193629.GJ10256@E5400> References: <20200716193629.GJ10256@E5400> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , Bengt Richter , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) We can't actually use (guix config) since it doesn't have a useful version number in this stage of the build process. See the use of make-config.scm in build-program of build-aux/build-self.scm. We need to use the nearest tag but that requires the git repo and we drop that in the channel checkout. See use of dot-git? in latest-channel-instance of (guix channels). To remedy this, I am generating .version before discarding the git repo. WDYT? Arun Isaac (1): self: Use nearest tag as the version string in documentation. guix/channels.scm | 15 ++++++++++++++- guix/self.scm | 11 +++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 17 19:55:33 2020 Received: (at 42212) by debbugs.gnu.org; 17 Jul 2020 23:55:33 +0000 Received: from localhost ([127.0.0.1]:58156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwaCT-0001Vc-94 for submit@debbugs.gnu.org; Fri, 17 Jul 2020 19:55:33 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwaCO-0001VK-6T for 42212@debbugs.gnu.org; Fri, 17 Jul 2020 19:55:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YiahTTMyvoQAmXRSYEFUDbN2r+1R2QrtQ5g9kzCRKL0=; b=nj8Fe6oQnGyQvSyFdr1Vd2lGC4 E6LZp7d6VmV2sA/dM8cCxCxBSgiqlTZQn0Z+TArtsPcnQ+ulKVy+NfQwqc7m8hIyL+Shp6aPcJzie P7OxZqANMLZW6Bz+Oeoe3g7yBs80lcM7mD8X6Uh2Hy1T+CrzcLNcxgSEiY2Dn5J+5i9g=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jwaC2-0015Vr-09; Sat, 18 Jul 2020 05:25:06 +0530 From: Arun Isaac To: Efraim Flashner , =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 1/1] self: Use nearest tag as the version string in documentation. Date: Sat, 18 Jul 2020 05:25:03 +0530 Message-Id: <20200717235503.19809-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200716193629.GJ10256@E5400> References: <20200716193629.GJ10256@E5400> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , Bengt Richter , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/channels.scm (latest-channel-instance): Write nearest tag into .version of the checkout. * guix/self.scm (info-manual): Use nearest tag from .version as the version string while generating documentation. --- guix/channels.scm | 15 ++++++++++++++- guix/self.scm | 11 +++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index bbabf654a9..d35cbc42cf 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (guix sets) #:use-module (guix store) #:use-module (guix i18n) + #:use-module (guix build utils) #:use-module ((guix utils) #:select (source-properties->location &error-location @@ -56,9 +58,11 @@ #:autoload (guix quirks) (%quirks %patches applicable-patch? apply-patch) #:use-module (ice-9 format) #:use-module (ice-9 match) + #:use-module (ice-9 popen) #:use-module (ice-9 vlist) #:use-module ((ice-9 rdelim) #:select (read-string)) #:use-module ((rnrs bytevectors) #:select (bytevector=?)) + #:use-module (rnrs io ports) #:export (channel channel? channel-name @@ -397,7 +401,16 @@ thus potentially malicious code."))))))) (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is ;; safe to do because 'switch-to-ref' eventually does a hard reset. - (apply-patches checkout commit patches)) + (apply-patches checkout commit patches) + + ;; Write nearest tag into .version. + (with-directory-excursion checkout + (let ((version + (call-with-port + (open-pipe* OPEN_READ "./build-aux/git-version-gen" ".tarball-version") + get-string-all))) + (call-with-output-file ".version" + (cut put-string <> version))))) (let* ((name (url+commit->name (channel-url channel) commit)) (checkout (add-to-store store name #t "sha256" checkout diff --git a/guix/self.scm b/guix/self.scm index f70b1ecdd8..8c94efa7de 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -459,16 +460,18 @@ a list of extra files, such as '(\"contributing\")." (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) + (rnrs io ports) (ice-9 match)) (mkdir #$output) - ;; Create 'version.texi'. - ;; XXX: Can we use a more meaningful version string yet one that - ;; doesn't change at each commit? + ;; Create 'version.texi'. Use nearest tag written in .version as the + ;; version string. (call-with-output-file "version.texi" (lambda (port) - (let ((version "0.0-git")) + (let* ((tag (call-with-input-file (string-append #$source "/.version") + get-string-all)) + (version (substring tag 0 (string-index-right tag #\.)))) (format port " @set UPDATED 1 January 1970 @set UPDATED-MONTH January 1970 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 20 04:13:48 2020 Received: (at 42212) by debbugs.gnu.org; 20 Jul 2020 08:13:48 +0000 Received: from localhost ([127.0.0.1]:33676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxQvk-00016N-B3 for submit@debbugs.gnu.org; Mon, 20 Jul 2020 04:13:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxQvg-000167-QP for 42212@debbugs.gnu.org; Mon, 20 Jul 2020 04:13:46 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58185) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxQvZ-0000J6-Pz; Mon, 20 Jul 2020 04:13:37 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=56426 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jxQvY-0006JP-NL; Mon, 20 Jul 2020 04:13:37 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: [PATCH 1/1] self: Use nearest tag as the version string in documentation. References: <20200716193629.GJ10256@E5400> <20200717235503.19809-2-arunisaac@systemreboot.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Thermidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Jul 2020 10:13:34 +0200 In-Reply-To: <20200717235503.19809-2-arunisaac@systemreboot.net> (Arun Isaac's message of "Sat, 18 Jul 2020 05:25:03 +0530") Message-ID: <87r1t6zjrl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42212 Cc: Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Arun, Arun Isaac skribis: > * guix/channels.scm (latest-channel-instance): Write nearest tag into .ve= rsion > of the checkout. > * guix/self.scm (info-manual): Use nearest tag from .version as the versi= on > string while generating documentation. Thanks for looking into it! Two comments: > + ;; Write nearest tag into .version. > + (with-directory-excursion checkout > + (let ((version > + (call-with-port > + (open-pipe* OPEN_READ "./build-aux/git-version-gen" ".ta= rball-version") > + get-string-all))) > + (call-with-output-file ".version" > + (cut put-string <> version))))) >=20=20 > (let* ((name (url+commit->name (channel-url channel) commit)) > (checkout (add-to-store store name #t "sha256" checkout I would rather not call out to =E2=80=98git-version-gen=E2=80=99 and instea= d use (git describe) or similar. However, unless I=E2=80=99m mistaken, the output of =E2=80=98git-version-ge= n=E2=80=99 changes at each commit, so we=E2=80=99d be rebuilding the manual at every commit, whic= h is what we should avoid here. One way to avoid that would be to look at the latest commit that touch doc/ instead of the latest commit overall (I think that=E2=80=99s what zimo= un was suggesting). Roughly run =E2=80=98git describe=E2=80=99 on =E2=80=98gi= t log doc/=E2=80=99, so to speak. (Using Guile-Git.) Thoughts? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 20 04:37:15 2020 Received: (at 42212) by debbugs.gnu.org; 20 Jul 2020 08:37:15 +0000 Received: from localhost ([127.0.0.1]:33681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxRIR-0001f3-7m for submit@debbugs.gnu.org; Mon, 20 Jul 2020 04:37:15 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:38256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxRIN-0001er-99 for 42212@debbugs.gnu.org; Mon, 20 Jul 2020 04:37:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=v0ZPzenHY9j3nyWWt7bGMZHUShu0iyFc4XmUmHBSXvw=; b=BOzZ7z5UcJjhte9mYhVdnsmKA WvT0PV6cU3dkuK4PhSPc0wTeSaXsC96Ir4a8NpcTSOR0RGdXdqe89hGYeTcuYYrKqAnubdYhtmLhr T5u6TFYKaYIvI3nEt+pbKRyHkL/YC0iCLhtuw3l89ToD5eO3ntgn32eXF7rBjnjRXWctc=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jxRIC-001BEW-9f; Mon, 20 Jul 2020 14:07:00 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [PATCH 1/1] self: Use nearest tag as the version string in documentation. In-Reply-To: <87r1t6zjrl.fsf@gnu.org> References: <20200716193629.GJ10256@E5400> <20200717235503.19809-2-arunisaac@systemreboot.net> <87r1t6zjrl.fsf@gnu.org> Date: Mon, 20 Jul 2020 14:06:48 +0530 Message-ID: <87y2ney44f.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > I would rather not call out to =E2=80=98git-version-gen=E2=80=99 and inst= ead use (git > describe) or similar. Sure, I'll do that. Then, perhaps we should even rewrite git-version-gen using (git describe). It would be nice to have that in guile too. WDYT? > However, unless I=E2=80=99m mistaken, the output of =E2=80=98git-version-= gen=E2=80=99 changes at > each commit, so we=E2=80=99d be rebuilding the manual at every commit, wh= ich is > what we should avoid here. Yes, but I discard the commit part of git-version-gen's output. I keep only the tag part. But, like zimoun, I didn't understand why we can't rebuild the manual every commit. Rebuilding the manual is quite cheap. So, substituting it shouldn't be a problem, right? > One way to avoid that would be to look at the latest commit that touch > doc/ instead of the latest commit overall (I think that=E2=80=99s what zi= moun > was suggesting). Roughly run =E2=80=98git describe=E2=80=99 on =E2=80=98= git log doc/=E2=80=99, so to > speak. (Using Guile-Git.) This sounds good. I'll try it and get back to you. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl8VV6EACgkQLiXui2GA K7PmqAf/S2ttkVBAnJnydeHPje3CBRwdu/cF2UaIDQgQXdvgcC3bf/VkdI8MXcd/ d9th3ahuaQ63prz7JH1EnvF9QuVGRhjTo1D1C1GF5gEpLQNLdGO07S0YS4J0h5TJ JXd1mSJGVOrW/fYbGDL3YbWXNhbFTk6HJiWhkwdebvlhVDjYoYV83GafHwdGMkLG 6Df6bs6eoR2D8aQc+0rZPcZYGjpcIJc/bkOlwuMAbd13YD14meC349JNwDMcZvlJ pT6HUGcDqcIZ27bEuAjOmbkxcKFnPnm3pQOUmptNTIqEIzVHvoYv/dpMYOlYI8lH onpYAgQglPt33tr7/AJC9VTKLTXKHA== =/GWM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 20 08:32:56 2020 Received: (at 42212) by debbugs.gnu.org; 20 Jul 2020 12:32:56 +0000 Received: from localhost ([127.0.0.1]:34137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxUyW-0005iA-Kr for submit@debbugs.gnu.org; Mon, 20 Jul 2020 08:32:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxUyV-0005hy-4b for 42212@debbugs.gnu.org; Mon, 20 Jul 2020 08:32:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33570) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxUyN-0003yA-A4; Mon, 20 Jul 2020 08:32:47 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=55672 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jxUyL-0007x5-9G; Mon, 20 Jul 2020 08:32:45 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Arun Isaac Subject: Re: [PATCH 1/1] self: Use nearest tag as the version string in documentation. References: <20200716193629.GJ10256@E5400> <20200717235503.19809-2-arunisaac@systemreboot.net> <87r1t6zjrl.fsf@gnu.org> <87y2ney44f.fsf@systemreboot.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Thermidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Jul 2020 14:32:41 +0200 In-Reply-To: <87y2ney44f.fsf@systemreboot.net> (Arun Isaac's message of "Mon, 20 Jul 2020 14:06:48 +0530") Message-ID: <87ft9mqsd2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42212 Cc: Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Arun Isaac skribis: >> I would rather not call out to =E2=80=98git-version-gen=E2=80=99 and ins= tead use (git >> describe) or similar. > > Sure, I'll do that. Then, perhaps we should even rewrite git-version-gen > using (git describe). It would be nice to have that in guile too. WDYT? Yes, but=E2=80=A6 one thing at a time. :-) >> However, unless I=E2=80=99m mistaken, the output of =E2=80=98git-version= -gen=E2=80=99 changes at >> each commit, so we=E2=80=99d be rebuilding the manual at every commit, w= hich is >> what we should avoid here. > > Yes, but I discard the commit part of git-version-gen's output. I keep > only the tag part. > > But, like zimoun, I didn't understand why we can't rebuild the manual > every commit. Rebuilding the manual is quite cheap. So, substituting it > shouldn't be a problem, right? Try rebuilding the manual + translations by yourself: it takes a few minutes (see also commit a524a31de43b330c911fb08ae02fcd880d32aa04 related commits). Also, if you don=E2=80=99t build it by yourself, you have to download its substitutes, which is also not free. So it=E2=80=99s really important to rebuild only when we have to. (guix se= lf) is written in that spirit. >> One way to avoid that would be to look at the latest commit that touch >> doc/ instead of the latest commit overall (I think that=E2=80=99s what z= imoun >> was suggesting). Roughly run =E2=80=98git describe=E2=80=99 on =E2=80= =98git log doc/=E2=80=99, so to >> speak. (Using Guile-Git.) > > This sounds good. I'll try it and get back to you. Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 20 09:43:01 2020 Received: (at 42212) by debbugs.gnu.org; 20 Jul 2020 13:43:01 +0000 Received: from localhost ([127.0.0.1]:34253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxW4L-0007TW-4X for submit@debbugs.gnu.org; Mon, 20 Jul 2020 09:43:01 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:32775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxW4H-0007TD-MK for 42212@debbugs.gnu.org; Mon, 20 Jul 2020 09:43:00 -0400 Received: by mail-qt1-f194.google.com with SMTP id 6so12975717qtt.0 for <42212@debbugs.gnu.org>; Mon, 20 Jul 2020 06:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=HtXiL+3SqM1oJYfaGhQLSD+dcdz0pa5kg6U2BmkJyR8=; b=XfBT+qLCaVZe1obsMtPZQGV4e8rFhL4jM13tHY8pO/hCLmX+76cG3IhVGsDddnnMA1 o1B5Li6soy/qZONxffJP3FcmI+3UvToNWFAJzkjGgFu8VqscT1QLTb5qiwogEEADwU2f 097wkOyjGsKoYz4mdNjJfu+eyXniWtWq+hgKAeKMUpt96M8pvzorHUO/8023OUwIFu7U QB3Z94DaIYOE/BPYrDmVzMmLH543KfoFODhszgpuZKryXFg8XpOeOZa6HKmJOGFP0U1E t4ee7k9pVdy0ZagexcZr3LJNGAijHfSUIpd8pfTr+onbC0cVg3oNqAxqL3HEMiLG9Qx0 rj/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=HtXiL+3SqM1oJYfaGhQLSD+dcdz0pa5kg6U2BmkJyR8=; b=aZEtJ3GR0vtKnpU4aF+Gt/xLNXWMzGPxg+nJG1Mnvvqu2aFL53GLeA80PfC34U1IAe ytfW9nt9pMIwOnQa6MKbAqgYZj0BuGfNZe8nmx7oRixoMZEPKoUTiMuNgAK0q3tyzQXX wGVMbp7MQbIvZ7yOxhJcRBs3NSkuR/XMKeH2Uyn+SCcMJwx8/5R4Fw9s8/xt6RxpWUW2 e+Cdq9PsqywxggWZtT7jpOC8+eCfZpR+dlrbo2Mta264r3PKyvTAP22a1yOjhrVqeTtX P+ttOF40PjTu2QlTwlraGZZJua6bl5Wi06i35ZZFxy6rGaSxYTKJRnMpJc9c+tl31KS+ /74A== X-Gm-Message-State: AOAM531c+RTRpHjk5biG7kW4yUFEp94Lsuqr5G4KsB+0Y5hQmcZYjIqo IRkLCOBvDOrmFSeiuj7V81n/35JS0J5vFmHbG7A= X-Google-Smtp-Source: ABdhPJygCzx3l4GrFPLll0sjKtMmheW7oRifcGV2k4LL1AkmJK1VL4OzhJs+kVrJR11jROZ8RrK/DI1HU9f32VP1kxY= X-Received: by 2002:aed:26e1:: with SMTP id q88mr24474575qtd.354.1595252572123; Mon, 20 Jul 2020 06:42:52 -0700 (PDT) MIME-Version: 1.0 References: <20200716193629.GJ10256@E5400> <20200717235503.19809-2-arunisaac@systemreboot.net> <87r1t6zjrl.fsf@gnu.org> <87y2ney44f.fsf@systemreboot.net> <87ft9mqsd2.fsf@gnu.org> In-Reply-To: <87ft9mqsd2.fsf@gnu.org> From: zimoun Date: Mon, 20 Jul 2020 15:42:40 +0200 Message-ID: Subject: Re: [PATCH 1/1] self: Use nearest tag as the version string in documentation. To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Arun Isaac , Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Mon, 20 Jul 2020 at 14:32, Ludovic Court=C3=A8s wrote: > > But, like zimoun, I didn't understand why we can't rebuild the manual > > every commit. Rebuilding the manual is quite cheap. So, substituting it > > shouldn't be a problem, right? > > Try rebuilding the manual + translations by yourself: it takes a few > minutes (see also commit a524a31de43b330c911fb08ae02fcd880d32aa04 > related commits). > > Also, if you don=E2=80=99t build it by yourself, you have to download its > substitutes, which is also not free. Not free but still cheap enough. :-) downloading from https://ci.guix.gnu.org/nar/lzip/p8xbha1fl3j23q05iya43ypzhzjmyr0j-guix-manu= al ... guix-manual 4.4MiB Especially compared to the other parts of "guix pull". > So it=E2=80=99s really important to rebuild only when we have to. (guix = self) > is written in that spirit. > > >> One way to avoid that would be to look at the latest commit that touch > >> doc/ instead of the latest commit overall (I think that=E2=80=99s what= zimoun > >> was suggesting). Roughly run =E2=80=98git describe=E2=80=99 on =E2=80= =98git log doc/=E2=80=99, so to > >> speak. (Using Guile-Git.) It was not what I was suggesting but it is the next step of my question. :-= ) Naively, is it not a situation about kind of grafts? If the last commit modifying the documentation is 1234abcd, then other changes unrelated to documentation are committed, say commit wxyz5678, I would expect to have that commit wxyz5678 appears in the documentation. As it seems the case with guix.gnu.org/manual/devel/en/. So, the documentation should be built with the commit 1234abcd and probably substituable, then grafted to refer to the last commit wxyz5648 where it is required. Even if referring to commit 1234abcd will be already enough. All the best, simon From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 27 19:14:00 2020 Received: (at 42212) by debbugs.gnu.org; 27 Jul 2020 23:14:00 +0000 Received: from localhost ([127.0.0.1]:56015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0CJk-0006Hp-8H for submit@debbugs.gnu.org; Mon, 27 Jul 2020 19:14:00 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:40716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0CJh-0006HX-6e for 42212@debbugs.gnu.org; Mon, 27 Jul 2020 19:13:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=U2k2x5a8pVIxpCb/6M7UeGjrJKc1NbLBDOKwp+QAKwo=; b=YFj7hfVdJ4K44OV0+jgzoG/hyE 9Y3X8yaqPimFLTt7Sug5b3ikHez5B/0UsPBvU2FxIkDCnGUGlK5tWPivZHGKLRKtUHzjrhxxhTI5z Gwov8rgMdBzR9ZO/twI981dT24wl/wiS/s1XuGQA/asDxdRU0PAXS8J3K4+krqa8siCs=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1k0CJK-001hFY-0x; Tue, 28 Jul 2020 04:43:34 +0530 From: Arun Isaac To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 0/1] Use nearest tag as the version string in documentation Date: Tue, 28 Jul 2020 04:43:30 +0530 Message-Id: <20200727231332.10489-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <87ft9mqsd2.fsf@gnu.org> References: <87ft9mqsd2.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The new guile-git based patch follows. Thanks! Arun Isaac (1): Use nearest tag as the version string in documentation. guix/channels.scm | 13 ++++++++++++- guix/self.scm | 10 ++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 27 19:14:00 2020 Received: (at 42212) by debbugs.gnu.org; 27 Jul 2020 23:14:00 +0000 Received: from localhost ([127.0.0.1]:56017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0CJk-0006Hs-Fl for submit@debbugs.gnu.org; Mon, 27 Jul 2020 19:14:00 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:40718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0CJi-0006HZ-9u for 42212@debbugs.gnu.org; Mon, 27 Jul 2020 19:13:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=MfS3FTER9Mmh30t/Gity0ZsCJ7HcN1gGLMTMkP4rAmM=; b=f5aEXetSPu9FGbGnxsJLDs93BX 0tMjorgCU2pEbMItDij2kJ2dJ7ZgDxarXY538aektpfn/T6tfqL/Rzj85s6iJIPugf70S3w3mhi5g IDLLu/EijmHu7VfCQs6qpemJHYIb8Tur0Qd3SJMaD5l2mU1wRnk4niJGDoBk/7nmGxQo=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1k0CJK-001hFY-89; Tue, 28 Jul 2020 04:43:34 +0530 From: Arun Isaac To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Arun Isaac Subject: [PATCH v2 1/1] Use nearest tag as the version string in documentation. Date: Tue, 28 Jul 2020 04:43:31 +0530 Message-Id: <20200727231332.10489-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <87ft9mqsd2.fsf@gnu.org> References: <87ft9mqsd2.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42212 Cc: Bengt Richter , Efraim Flashner , 42212@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/channels.scm (latest-channel-instance): Write nearest tag into .version of the checkout. * guix/self.scm (info-manual): Use nearest tag from .version as the version string while generating documentation. --- guix/channels.scm | 13 ++++++++++++- guix/self.scm | 10 ++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index ad2442f50e..e8941bb28e 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -393,7 +394,17 @@ thus potentially malicious code.")))))))) (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is ;; safe to do because 'switch-to-ref' eventually does a hard reset. - (apply-patches checkout commit patches)) + (apply-patches checkout commit patches) + + ;; Write into .version, the nearest tag without the "v" prefix. + (call-with-output-file (string-append checkout "/.version") + (lambda (port) + (display (substring + (describe-format + (describe-workdir (repository-open checkout)) + (make-describe-format-options #:abbreviated-size 0)) + 1) + port)))) (let* ((name (url+commit->name (channel-url channel) commit)) (checkout (add-to-store store name #t "sha256" checkout diff --git a/guix/self.scm b/guix/self.scm index f70b1ecdd8..58ca4386f1 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -459,16 +460,17 @@ a list of extra files, such as '(\"contributing\")." (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) + (rnrs io ports) (ice-9 match)) (mkdir #$output) - ;; Create 'version.texi'. - ;; XXX: Can we use a more meaningful version string yet one that - ;; doesn't change at each commit? + ;; Create 'version.texi'. Use nearest tag written in .version as the + ;; version string. (call-with-output-file "version.texi" (lambda (port) - (let ((version "0.0-git")) + (let* ((version (call-with-input-file (string-append #$source "/.version") + get-string-all))) (format port " @set UPDATED 1 January 1970 @set UPDATED-MONTH January 1970 -- 2.26.2