From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SKeLEQojdmSBLgAASxT56A (envelope-from ) for ; Tue, 30 May 2023 18:23:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uJOnEQojdmSxxgAAauVa8A (envelope-from ) for ; Tue, 30 May 2023 18:23:38 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0CE872CBA1 for ; Tue, 30 May 2023 18:23:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4285-0000MJ-BD; Tue, 30 May 2023 12:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q427t-00009z-AQ for bug-guix@gnu.org; Tue, 30 May 2023 12:23:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q427i-0005mj-L5 for bug-guix@gnu.org; Tue, 30 May 2023 12:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q427i-0003Rl-97 for bug-guix@gnu.org; Tue, 30 May 2023 12:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63726: time-machine without options does not get the latest commit Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 30 May 2023 16:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63726 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Konrad Hinsen , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63726@debbugs.gnu.org Received: via spool by 63726-submit@debbugs.gnu.org id=B63726.168546374113182 (code B ref 63726); Tue, 30 May 2023 16:23:02 +0000 Received: (at 63726) by debbugs.gnu.org; 30 May 2023 16:22:21 +0000 Received: from localhost ([127.0.0.1]:34013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4273-0003QT-3Q for submit@debbugs.gnu.org; Tue, 30 May 2023 12:22:21 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:38119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q426z-0003Q4-IM for 63726@debbugs.gnu.org; Tue, 30 May 2023 12:22:19 -0400 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3f3284dff6cso8640045e9.0 for <63726@debbugs.gnu.org>; Tue, 30 May 2023 09:22:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685463732; x=1688055732; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=zEWQMLzpt0u3E8dYX305/p0q4dCLj0BM32vsT/vF4G4=; b=pYVUaaOKAAId176MSpdGS6V4sgGRPwP4lXaclee/EV21lfceCCLnAvsay5C5b5qmIy eGl9XNVLYQU8ydLvWi0PLuebOY56qPMkoaBmLWx5YQq7iTsVKkVxjnG6Va1akuCpUDWT yKc1+RczjeVXVzAf6eWg2VdcQRSWOvs51ob2hWpuA5xx7wLeXhzPYMmSVaJ9YwpF7/fJ ILgiypXPYvPZObVu7Vysq9CqPko53DAHq2m4zoMnnaT9C9DRiKLfsHfxk3biTZ0CcYlz 3YIPv4AkOcBWdTnuxoWHEa8JV38/fAdxSknHdVu1fetrJyu8IoD6vCGt9rrQ0hsmFfto iwHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685463732; x=1688055732; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zEWQMLzpt0u3E8dYX305/p0q4dCLj0BM32vsT/vF4G4=; b=GRHsrgOtUhApXCRhRwor/k3WgdTOQlmuvX/uX3u7rr/rFSiKUGvRmSHwUc/aw6sQeF x42DZDAjCxGzBENezhJIS/23TeDlX6DkSYwDxoBSGiDiyI8sHMleAnP5CBYnsJ4drz6C SmuqfaDXazX0AuI6mFSAc/SypcXCkiXPs5p/HiqfjT5acA5ehBGA1PwNh6UQp2+iNpC1 0S29L3n2bepUlllgnfF3s4hCyJYvZyuLXMXWHf/Jak3ehWvpIWZnfR25JdzVq52fkosS Fiv8LCNqnpMw1D0GenLJy7MSIx1QTENUHTlOQDkH1RpU5apIiLLNNEDfhQEgLP7UyZCx UiZw== X-Gm-Message-State: AC+VfDy3yDRZjjq0u1dw5WQ7KmdEqIWviUteJUXo+eGfd/pam/R60P9g /15czfieneoagBiSLCfsw05bpj3v+xs= X-Google-Smtp-Source: ACHHUZ4Ltc8yyklAyQ4l5ZggyXjWKeAyZiZp4ZeqSfpScRE1h3DrqC23PU7AReJl41clk1goL4kX/A== X-Received: by 2002:a05:600c:35cc:b0:3f5:927:2b35 with SMTP id r12-20020a05600c35cc00b003f509272b35mr2585183wmq.1.1685463731603; Tue, 30 May 2023 09:22:11 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id f7-20020a7bc8c7000000b003f42158288dsm21325137wml.20.2023.05.30.09.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 09:22:11 -0700 (PDT) From: Simon Tournier In-Reply-To: References: <87v8ggwmat.fsf@gmail.com> <875y8gcedh.fsf@gnu.org> Date: Tue, 30 May 2023 15:32:07 +0200 Message-ID: <87r0qyrlm0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685463818; a=rsa-sha256; cv=none; b=teEajn7oBlj2IjZ3pQr6Bs+tEm60lE+HpHJmEVp4R2WQLuEbEjinAmT+90mZFONwhn7sd/ xU0R7PCc/KSQyNnRQfL1Vj92AffQaIeT2fW9UTPX93c3p+rhSsuNixBt31xFFv3ci4VfuE IkgUU7NxeWWWOD+QABsaqaSf53L+uBAZO9XyM8BFo3Ul8VTjBwSnMJVHavvKxJeipZzC5j gzNgz/SOPyryDVUrMBQcXeRkB2zRDb07gllVvK6rXmm9BITcnRDiXQ6GVC0WbomkXIC7o3 kcY6SqoRHAcVULOVBmRE0yzSSKv/yk/+b3JhLg8YcqZJAyxCBjSSxT/1OsurUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=pYVUaaOK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685463818; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=zEWQMLzpt0u3E8dYX305/p0q4dCLj0BM32vsT/vF4G4=; b=UVSPRWlgDzLqkbdzYgcgHi2ZaLsuLCw30oyxX9lkVq4/rnag2+sAHg0y8ELuiVsOqxKB43 zHx4u2IUAxP/2IOU3zpbAF6mJdhrhzylFiVxN1MlvdqtugIEtUGoUSYoAR2xJ+640UKZY+ R4ZQLHiLBjMiHHoySrmVXOu3oEWOiLGl3X3dsL9lhQyUSjWZ5WbYdXa2/afZZ0pSDqAHpj 4hmSVISAUtqfwfpmKD81+FqtD1gjUQcVs+17Beht8psGa/hsRLug3jT+/0cnrFZr0hyMUA CJrhFAfkYykhXWuYmuiM2m62+ozLT6zT9+F6+T5+kfBfQ1nPQbH8zEFuW2O9cQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=pYVUaaOK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.36 X-Spam-Score: 7.36 X-Migadu-Queue-Id: 0CE872CBA1 X-TUID: 8NwC5+iwqH3t --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Konrad, On ven., 26 mai 2023 at 13:15, Konrad Hinsen w= rote: > Hi, > >> Should we fix the doc or should we fix the code?=E2=80=A6 > > I vote for fixing the doc. Two reasons: What about this patch? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=p.patch Content-Description: p.patch >From 63b862ed9f3d3b019af3c6926bc1737f573bdfe6 Mon Sep 17 00:00:00 2001 Message-Id: <63b862ed9f3d3b019af3c6926bc1737f573bdfe6.1685093404.git.zimon.toutoune@gmail.com> From: Simon Tournier Date: Fri, 26 May 2023 11:26:32 +0200 Subject: [PATCH] doc: Reword guix time-machine without option. * doc/guix.texi (Invoking guix time-machine): Reword the behaviour in the absence of any option. --- doc/guix.texi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 31dc33fb97..54f8a20196 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4958,16 +4958,20 @@ Invoking guix time-machine @xref{Channels} for more information. @end table -As for @command{guix pull}, the absence of any options means that the -latest commit on the master branch will be used. The command +Similarly as @command{guix pull}, the absence of any options means that +either the user's @file{~/.config/guix/channels.scm} file, or either the +system-wide @file{/etc/guix/channels.scm} file, or either the built-in +default channels specified in the @code{%default-channels} will be +honored, in that order. The command @example guix time-machine -- build hello @end example -will thus build the package @code{hello} as defined in the master branch, -which is in general a newer revision of Guix than you have installed. -Time travel works in both directions! +will thus build the package @code{hello} as defined by the previous +@dfn{channels} file (@pxref{Channels}). In general, it builds a newer +revision of Guix than you have installed. Time travel works in both +directions! Note that @command{guix time-machine} can trigger builds of channels and their dependencies, and these are controlled by the standard build base-commit: 99fc7e5dd3c9c92f9b6c2e51db9dc5b0481a56b2 prerequisite-patch-id: 7ff5f10954ba2e9663c6e7b15e7aee448c8b74c2 prerequisite-patch-id: cb31c4d7ad8d27df155dcf57b61116048a6b0681 prerequisite-patch-id: f256649d0fac1d618b07615c97c46e66436b9262 -- 2.38.1 --=-=-= Content-Type: text/plain Cheers, simon --=-=-=--