From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 11:23:25 2022 Received: (at submit) by debbugs.gnu.org; 12 Jan 2022 16:23:26 +0000 Received: from localhost ([127.0.0.1]:58778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7gPF-00040Z-OW for submit@debbugs.gnu.org; Wed, 12 Jan 2022 11:23:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:37836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7gPB-00040M-SV for submit@debbugs.gnu.org; Wed, 12 Jan 2022 11:23:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7gPB-0000rS-N2 for bug-guix@gnu.org; Wed, 12 Jan 2022 11:23:21 -0500 Received: from [2001:470:142:3::e] (port=50372 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7gP4-0004oD-Ax for bug-guix@gnu.org; Wed, 12 Jan 2022 11:23:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=mxGZE0TSMZcWwWwleSYq7363oKbf+uoROGxm2pSpwog=; b=i1m9Y5vf0LZ7lw Ta4QABLakgHEGALCNxDVif63nR6MnWGB2duIjHGk8IZ7LdgRSsmXNT87kKgPbHEWLlYkKmWeFxxjE BkbXnuLuPVRIjdr8q1M3pJHw88C0CDDDbHJL3v3nTk6yR6b8VBmSyxGyYSFSSn1DxPF4FixW7aRp5 wTpLonBuConhylUJ9NIDiJiDfAKTB4yShKzF3nZodvyQ8An7hxkjDP3fqkxWb23/c7dyuvghgFCwT iLz2ijy51wnPgAeP4s+UVDK77NqMuxXTtmdBZbhC9r4TsXDAK0u7fpru7Tu4X2wmihTnfazyV7bm7 U7ATOp95z9UqJ8ObQM6Q==; Received: from [2a01:e0a:19b:d9a0:45b5:a14a:5c75:5737] (port=42610 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7gP3-0002S3-R5 for bug-guix@gnu.org; Wed, 12 Jan 2022 11:23:14 -0500 From: Mathieu Othacehe To: bug-guix@gnu.org Subject: installer: referring to N-1 guix is problematic. Date: Wed, 12 Jan 2022 17:23:11 +0100 Message-ID: <87czkw6hzk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) 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: -3.3 (---) Hello, If I download the latest installer and use it to install a new system, the "guix system init" command will install the guix package defined in the (gnu packages package-management) module. That means that if the installer is built with a guix package at the version N in that module, the guix installed by the installer will be at version N-1. Besides the fact it is quite disturbing there are at least two major issues: * If the guix package is broken, it needs to build updated twice. I recently added a comment about that: --8<---------------cut here---------------start------------->8--- ;; If you are updating this package because it fails to build, you need to ;; actually update it *twice*, as the installer is pointing to the N-1 guix ;; package revision. --8<---------------cut here---------------end--------------->8--- * When the guix package is updated twice in two separate but near commits, Cuirass that is checkouting Guix every 5 minutes might miss the intermediate version of the guix package. Hence, the installation is taking a while because the guix package is expensive to build. Any idea on how to improve this inception problem? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 12:33:35 2022 Received: (at control) by debbugs.gnu.org; 12 Jan 2022 17:33:35 +0000 Received: from localhost ([127.0.0.1]:58950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hV9-0002FW-NU for submit@debbugs.gnu.org; Wed, 12 Jan 2022 12:33:35 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hV8-0002FG-5I for control@debbugs.gnu.org; Wed, 12 Jan 2022 12:33:34 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 4461C22E for ; Wed, 12 Jan 2022 18:33:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bh-Fv-yxaC6D for ; Wed, 12 Jan 2022 18:33:28 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E1AEDF2 for ; Wed, 12 Jan 2022 18:33:27 +0100 (CET) Date: Wed, 12 Jan 2022 18:33:27 +0100 Message-Id: <87r19crh94.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #53210 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 4461C22E X-Spamd-Result: default: False [0.61 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[control@debbugs.gnu.org]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(0.71)[subject]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: control 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: -0.0 (/) severity 53210 important quit From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 12:41:46 2022 Received: (at 53210) by debbugs.gnu.org; 12 Jan 2022 17:41:46 +0000 Received: from localhost ([127.0.0.1]:58963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hd4-0002Uh-4Z for submit@debbugs.gnu.org; Wed, 12 Jan 2022 12:41:46 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hd1-0002UP-Nc for 53210@debbugs.gnu.org; Wed, 12 Jan 2022 12:41:44 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B3CEA22E; Wed, 12 Jan 2022 18:41:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zjC8M4D0_V8u; Wed, 12 Jan 2022 18:41:37 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id A89D11DC; Wed, 12 Jan 2022 18:41:36 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Mathieu Othacehe Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. References: <87czkw6hzk.fsf@gnu.org> Date: Wed, 12 Jan 2022 18:41:36 +0100 In-Reply-To: <87czkw6hzk.fsf@gnu.org> (Mathieu Othacehe's message of "Wed, 12 Jan 2022 17:23:11 +0100") Message-ID: <87lezkrgvj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: B3CEA22E X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 53210 Cc: 53210@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: -0.0 (/) Hi! Mathieu Othacehe skribis: > Any idea on how to improve this inception problem? We can arrange for =E2=80=98installation-os=E2=80=99 to use Guix from the c= urrent commit, as built by (guix self), instead of using the =E2=80=98guix=E2=80= =99 package. (For the record, (gnu ci) already does that in =E2=80=98system-test-jobs=E2= =80=99 to make installation tests faster.) I=E2=80=99ll take a look hopefully in the coming days and send a patch here. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 12:42:08 2022 Received: (at control) by debbugs.gnu.org; 12 Jan 2022 17:42:08 +0000 Received: from localhost ([127.0.0.1]:58975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hdQ-0002Wd-KI for submit@debbugs.gnu.org; Wed, 12 Jan 2022 12:42:08 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7hdP-0002Vg-Nd for control@debbugs.gnu.org; Wed, 12 Jan 2022 12:42:08 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 4DCC2746 for ; Wed, 12 Jan 2022 18:42:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kUbWNDUEbW7U for ; Wed, 12 Jan 2022 18:42:01 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D201EF2 for ; Wed, 12 Jan 2022 18:42:01 +0100 (CET) Date: Wed, 12 Jan 2022 18:42:01 +0100 Message-Id: <87h7a8rguu.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #53214 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 4DCC2746 X-Spamd-Result: default: False [0.61 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[control@debbugs.gnu.org]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(0.71)[subject]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: control 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: -0.0 (/) block 53214 by 53210 quit From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 04:29:23 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 09:29:23 +0000 Received: from localhost ([127.0.0.1]:39719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXff-0006Da-Aq for submit@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:23 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfd-0006DS-3D for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:22 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 436DB184F29; Mon, 14 Feb 2022 09:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644830960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8UkMd1WPXQoLTdgB5a3xlEZ9q9fZ/ZyxixQ+2gatG5g=; b=IhKbznmQFdv9woUPpfb1j6/JcashcBCyF6tXVhNjBmZ6L7WLK7lA3deaASWYqCVPlsT1sh k7QGizkXYRxxhzd5dp8v9DfhWz8rYYCPQ78eqgygM8qa0rpxMXU4yquRxCWKbLRBOufv00 lnc8wdZgAPUdSw4YLmAY9QM7BI8n+VrLpoD9jtHI4LjkiSTaHLEvTEOQVgPi9J54LVlokU tsGRR1c4GFZzSp4D6aHvftvH40eJNUmdIvUxe4gtOsntjZpCncjqDorUitmPZ9LwP9yD7Z i7YGVEi3wEicFwO/POuilIXrf5u2QgAA5XNEDONSEnf6TuPHSCgy7t57WfSf4Q== From: Josselin Poiret To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Mathieu Othacehe Subject: [WIP PATCH 0/4] Make current-guix work when run outside a Git checkout Date: Mon, 14 Feb 2022 10:29:04 +0100 Message-Id: <20220214092908.16801-1-dev@jpoiret.xyz> In-Reply-To: <87lezkrgvj.fsf@gnu.org> References: <87lezkrgvj.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spamd-Bar: ++++ X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello everyone, I've been working on this for a bit, trying to find the best approach. First, let me try to summarize the different ways in which Guix can be run, and how it is built: Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello everyone, I've been working on this for a bit, trying to find the best approach. First, let me try to summarize the different ways in which Guix can be run, and how it is built: Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello everyone, I've been working on this for a bit, trying to find the best approach. First, let me try to summarize the different ways in which Guix can be run, and how it is built: * From a `guix pull` profile. This is the most common. The `guix pull` profile's manifest file holds specific metadata describing the channels that were used to build the generation, which can be fetched by `(current-channels)` from (guix describe). * From a built Guix inside the store, outside a `guix pull` profile. This is what happens when the user hasn't `guix pull`ed yet after a Guix System installation, for example. Here, the only available metadata is the one embedded in (guix config) by the build process, and (current-channels) returns that one. * From a Git checkout. Here, there is no build metadata at all. Furthermore, there are two ways to build Guix: either through the `guix` package definition, which uses the Makefile, or through `build-aux/build-self.scm` which uses `guix/self.scm`. Here, I use the second method, since it's how the current guix is most likely built. This means that, with proper care, all the derivations already have their output in the store. This is only a WIP as there are some unresolved things: I've disabled authentication, since I'm currently testing my own unsigned patches. Should we indiscriminately enable it? This would cause some issues for people that have their own 'guix channel. Maybe we could enable authentication if the channel URL is the default one? Also, when I tried to replace the guix in the installer by (current-guix), it ended up building the Guix derivation multiple times, even though the package is memoized and the package->derivation process should be cached. There's a bit of rift between what the ci uses (renamed here to channel-profile-build-system) and what current-guix uses, since the former builds a profile as a package, whereas the latter simply builds the derivation for the 'guix channel. This avoids creating profile collisions when the package is added to the system profile, but it also means we don't get the package cache generation. Best, Josselin Poiret (4): gnu: ci: Move generic channel building code. gnu: Rename channel-build-system and channel-source->package. gnu: current-guix: Support when running outside a checkout. gnu: package-management: Memoize current-guix. etc/system-tests.scm | 3 +- gnu/ci.scm | 40 +------------------ gnu/packages/package-management.scm | 60 +++++++++++++++++++++++------ guix/channels.scm | 51 ++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 52 deletions(-) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 04:29:27 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 09:29:27 +0000 Received: from localhost ([127.0.0.1]:39723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfi-0006Du-Kv for submit@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:27 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXff-0006Dc-R6 for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:24 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3C345185182; Mon, 14 Feb 2022 09:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644830963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pmOM/u8ObPqJxjHfDZJQGLutL4t9sZsAJGxO5+8TJac=; b=AQxpMs38WXGBkz2InsS7JjPaQIdKvs4DT0pW1Gp4fDxn6VIaOcLRYrBiB9ywg4O1HWkz9A 7/ia3Sy8GCHM3VT7kaS7Vzyk8JZE+NpjiJmvxMXqP0hlyC9WoXN88ppAgUK5qJay6aoI/R RWQdSO2USGfU3PWQBa/JyoO42F0T4One9T5TpIjgvvjHyzBkUsHZrMMebyu3A5XnGMbSQP VeRWHfe0aQSg8kUIJiEkwKe9xN0jQxzckbb1SmVuA091TWynCBI3SY6LI0XZQEF4x4YjTm V0NpczS7GlGb3f2Ed3hykl07clnBf285alMDSx12Bpvfk+Y68+09i9oS2fMCMg== From: Josselin Poiret To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Mathieu Othacehe Subject: [WIP PATCH 1/4] gnu: ci: Move generic channel building code. Date: Mon, 14 Feb 2022 10:29:05 +0100 Message-Id: <20220214092908.16801-2-dev@jpoiret.xyz> In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. (channel-source->package): Move to gnu/packages/package-management.scm. * guix/channels.scm (channel-build-system): Moved from gnu/ci.sc [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. (channel-source->package): Move to gnu/packages/package-management.scm. * guix/channels.scm (channel-build-system): Moved from gnu/ci.sc [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. (channel-source->package): Move to gnu/packages/package-management.scm. * guix/channels.scm (channel-build-system): Moved from gnu/ci.scm. * gnu/packages/package-management.scm (channel-source->package): Moved from gnu/ci.scm. * etc/system-tests.scm: Use module (gnu packages package-management) instead of (gnu ci). --- etc/system-tests.scm | 1 - gnu/ci.scm | 38 ----------------------------- gnu/packages/package-management.scm | 16 ++++++++++++ guix/channels.scm | 27 ++++++++++++++++++++ 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/etc/system-tests.scm b/etc/system-tests.scm index 1085deed24..ba0c106553 100644 --- a/etc/system-tests.scm +++ b/etc/system-tests.scm @@ -18,7 +18,6 @@ (use-modules (gnu tests) (gnu packages package-management) - ((gnu ci) #:select (channel-source->package)) ((guix git-download) #:select (git-predicate)) ((guix utils) #:select (current-source-directory)) (git) diff --git a/gnu/ci.scm b/gnu/ci.scm index 35fd583f75..be19bda413 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -32,7 +32,6 @@ (define-module (gnu ci) #:use-module (guix channels) #:use-module (guix config) #:use-module (guix derivations) - #:use-module (guix build-system) #:use-module (guix monads) #:use-module (guix gexp) #:use-module (guix ui) @@ -72,7 +71,6 @@ (define-module (gnu ci) %core-packages %cross-targets - channel-source->package arguments->systems cuirass-jobs)) @@ -300,42 +298,6 @@ (define MiB '())) '())) -(define channel-build-system - ;; Build system used to "convert" a channel instance to a package. - (let* ((build (lambda* (name inputs - #:key source commit system - #:allow-other-keys) - (mlet* %store-monad ((source (if (string? source) - (return source) - (lower-object source))) - (instance - -> (checkout->channel-instance - source #:commit commit))) - (channel-instances->derivation (list instance))))) - (lower (lambda* (name #:key system source commit - #:allow-other-keys) - (bag - (name name) - (system system) - (build build) - (arguments `(#:source ,source - #:commit ,commit)))))) - (build-system (name 'channel) - (description "Turn a channel instance into a package.") - (lower lower)))) - -(define* (channel-source->package source #:key commit) - "Return a package for the given channel SOURCE, a lowerable object." - (package - (inherit guix) - (version (string-append (package-version guix) "+")) - (build-system channel-build-system) - (arguments `(#:source ,source - #:commit ,commit)) - (inputs '()) - (native-inputs '()) - (propagated-inputs '()))) - (define* (system-test-jobs store system #:key source commit) "Return a list of jobs for the system tests." diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03cc9a6612..edef91ff7e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -114,6 +114,9 @@ (define-module (gnu packages package-management) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + ;; This will be loaded by build-self.scm, but guile-git is unavailable, so + ;; lazily load instead. + #:autoload (guix channels) (channel-build-system guix-channel?) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -572,6 +575,19 @@ (define (wrong-extension? file) (_ #t))) +(define-public channel-source->package + (lambda* (source #:key commit) + "Return a package for the given channel SOURCE, a lowerable object." + (package + (inherit guix) + (version (string-append (package-version guix) "+")) + (build-system channel-build-system) + (arguments `(#:source ,source + #:commit ,commit)) + (inputs '()) + (native-inputs '()) + (propagated-inputs '())))) + (define-public current-guix-package ;; This parameter allows callers to override the package that 'current-guix' ;; returns. This is useful when 'current-guix' cannot compute it by itself, diff --git a/guix/channels.scm b/guix/channels.scm index 5f47834c10..d637d5863a 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -27,6 +27,7 @@ (define-module (guix channels) #:select (openpgp-public-key-fingerprint openpgp-format-fingerprint)) #:use-module (guix base16) + #:use-module (guix build-system) #:use-module (guix records) #:use-module (guix gexp) #:use-module (guix modules) @@ -93,6 +94,8 @@ (define-module (guix channels) channel-instances->derivation ensure-forward-channel-update + channel-build-system + profile-channels manifest-entry-channel sexp->channel @@ -952,6 +955,30 @@ (define* (latest-channel-derivation #:optional (channels %default-channels) validate-pull))) (channel-instances->derivation instances))) +(define channel-build-system + ;; Build system used to "convert" a channel instance to a package. + (let* ((build (lambda* (name inputs + #:key source commit system + #:allow-other-keys) + (mlet* %store-monad ((source (if (string? source) + (return source) + (lower-object source))) + (instance + -> (checkout->channel-instance + source #:commit commit))) + (channel-instances->derivation (list instance))))) + (lower (lambda* (name #:key system source commit + #:allow-other-keys) + (bag + (name name) + (system system) + (build build) + (arguments `(#:source ,source + #:commit ,commit)))))) + (build-system (name 'channel) + (description "Turn a channel instance into a package.") + (lower lower)))) + (define* (sexp->channel sexp #:optional (name 'channel)) "Read SEXP, a provenance sexp as created by 'channel-instance->sexp'; use NAME as the channel name if SEXP does not specify it. Return #f if the sexp -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 04:29:31 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 09:29:31 +0000 Received: from localhost ([127.0.0.1]:39727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfn-0006EC-31 for submit@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:31 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfk-0006E4-Se for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:29 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B3FDC1851DF; Mon, 14 Feb 2022 09:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644830968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r4T2ZRsPjobRkXLwUBY8qDG/GaAAgsVKNT/doBlYhU4=; b=UOXjCcMGTYisSaPkrGf5+U0w5ma+v7dl48wf7ysADrB1VmCyJbjQhtwCdMr+tlO1jN3Nmg dTm4b38+dS2VN1PMao/dXc8MHAzbw0RHaaqV+nOo/L5JiaH61i8FBQEqqfCq224Lj9hJJH mCALuUq0Go8L1CaqXc6dEMx3qSydWL75MC4oYHJePWxrIH9ZD5ieYWv8CpAXagqTcuv9of wGs/D7WcG6lfnzIhnDq+S9XCZsi8abS1eM6VCwY0OE/GxK5ja2DFRWIepJ/dTNOPWSkyS9 rmTBCRKdsoP+xFC0WIIkOdN+nITc8ykIpcYSGM/GmQFjDdlTqab1QJSVY8U8lw== From: Josselin Poiret To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Mathieu Othacehe Subject: [WIP PATCH 2/4] gnu: Rename channel-build-system and channel-source->package. Date: Mon, 14 Feb 2022 10:29:06 +0100 Message-Id: <20220214092908.16801-3-dev@jpoiret.xyz> In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * etc/system-tests.scm (tests-for-current-guix): * gnu/ci.scm (system-test-jobs): * gnu/packages/package-management.scm (channel-source->package, current-guix): * guix/channels.scm (channel-build-syst [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * etc/system-tests.scm (tests-for-current-guix): * gnu/ci.scm (system-test-jobs): * gnu/packages/package-management.scm (channel-source->package, current-guix): * guix/channels.scm (channel-build-syst [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * etc/system-tests.scm (tests-for-current-guix): * gnu/ci.scm (system-test-jobs): * gnu/packages/package-management.scm (channel-source->package, current-guix): * guix/channels.scm (channel-build-system): Rename channel-build-system to channel-profile-build-system and channel-source->package to channel-source->profile-package. --- etc/system-tests.scm | 2 +- gnu/ci.scm | 2 +- gnu/packages/package-management.scm | 4 ++-- guix/channels.scm | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/etc/system-tests.scm b/etc/system-tests.scm index ba0c106553..ae5e604e10 100644 --- a/etc/system-tests.scm +++ b/etc/system-tests.scm @@ -48,7 +48,7 @@ (define (tests-for-current-guix source commit) ;; ;; make check-system TESTS=installed-os (parameterize ((current-guix-package - (channel-source->package source #:commit commit))) + (channel-source->profile-package source #:commit commit))) (match (getenv "TESTS") (#f (all-system-tests)) diff --git a/gnu/ci.scm b/gnu/ci.scm index be19bda413..1848015194 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -319,7 +319,7 @@ (define (->job test) ;; expensive. It also makes sure we get a valid Guix package when this ;; code is not running from a checkout. (parameterize ((current-guix-package - (channel-source->package source #:commit commit))) + (channel-source->profile-package source #:commit commit))) (map ->job (all-system-tests))) '())) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index edef91ff7e..35913e6153 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -575,13 +575,13 @@ (define (wrong-extension? file) (_ #t))) -(define-public channel-source->package +(define-public channel-source->profile-package (lambda* (source #:key commit) "Return a package for the given channel SOURCE, a lowerable object." (package (inherit guix) (version (string-append (package-version guix) "+")) - (build-system channel-build-system) + (build-system channel-profile-build-system) (arguments `(#:source ,source #:commit ,commit)) (inputs '()) diff --git a/guix/channels.scm b/guix/channels.scm index d637d5863a..01f63d9631 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -94,7 +94,7 @@ (define-module (guix channels) channel-instances->derivation ensure-forward-channel-update - channel-build-system + channel-profile-build-system profile-channels manifest-entry-channel @@ -955,8 +955,9 @@ (define* (latest-channel-derivation #:optional (channels %default-channels) validate-pull))) (channel-instances->derivation instances))) -(define channel-build-system - ;; Build system used to "convert" a channel instance to a package. +(define channel-profile-build-system + ;; Build system used to "convert" a channel instance to a profile, in + ;; package form. (let* ((build (lambda* (name inputs #:key source commit system #:allow-other-keys) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 04:29:36 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 09:29:36 +0000 Received: from localhost ([127.0.0.1]:39731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfs-0006EW-Cs for submit@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:36 -0500 Received: from jpoiret.xyz ([206.189.101.64]:37042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfq-0006EO-1C for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:34 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 0538E1851E0; Mon, 14 Feb 2022 09:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644830973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DWANRgEi0auPDrqPUvJYgOvaGO5cVJgxO2kqKSgK4YE=; b=RnPMCxb9NR/PFG2wvRnCKc6pPuSgbYIb+n71V3aPIUrBtpRrvax0gwyXnqTFIn032zrXm4 OmgS0wfIjk6oVApyZGpantqJD71Qy7sCH1qXZfSs1w5rFrZ9New9Yf3oKtAWMBKQfjjA1j fZIaeRV/NYtjG63q30dSutD7qEwV1Vj1H1Ve3VYjh+utgxVSXalDQURoV9ZtwGYtC7wxMG WPWXpfZyiI4IQ1KQTQS/2C4am6wVR41e5XPQJNUGNqfhyW8m1ndURJEW8mg79nHa5kJHfO HrYvAQ9IM33dvOSNMwHkS7pujzF8d68j6dDlgkdsAT062aAHnVprelkdo9fCxw== From: Josselin Poiret To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Mathieu Othacehe Subject: [WIP PATCH 3/4] gnu: current-guix: Support when running outside a checkout. Date: Mon, 14 Feb 2022 10:29:07 +0100 Message-Id: <20220214092908.16801-4-dev@jpoiret.xyz> In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/channels.scm (channel-build-system): Add build system that turns a channel record into a package. * gnu/packages/package-management.scm (current-guix): Use channel-build-system. --- gnu/package [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/channels.scm (channel-build-system): Add build system that turns a channel record into a package. * gnu/packages/package-management.scm (current-guix): Use channel-build-system. --- gnu/package [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * guix/channels.scm (channel-build-system): Add build system that turns a channel record into a package. * gnu/packages/package-management.scm (current-guix): Use channel-build-system. --- gnu/packages/package-management.scm | 45 +++++++++++++++++++++-------- guix/channels.scm | 23 +++++++++++++++ 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 35913e6153..fe906fd440 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -116,10 +116,14 @@ (define-module (gnu packages package-management) #:use-module (guix build-system trivial) ;; This will be loaded by build-self.scm, but guile-git is unavailable, so ;; lazily load instead. - #:autoload (guix channels) (channel-build-system guix-channel?) + #:autoload (guix channels) (channel-profile-build-system + channel-build-system + guix-channel?) + #:use-module (guix describe) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) + #:autoload (guix git) (git-checkout) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -588,6 +592,18 @@ (define-public channel-source->profile-package (native-inputs '()) (propagated-inputs '())))) +(define-public channel->package + (lambda (channel) + "Return a package for the given CHANNEL." + (package + (inherit guix) + (version (string-append (package-version guix) "+")) + (build-system channel-build-system) + (arguments `(#:channel ,channel)) + (inputs '()) + (native-inputs '()) + (propagated-inputs '())))) + (define-public current-guix-package ;; This parameter allows callers to override the package that 'current-guix' ;; returns. This is useful when 'current-guix' cannot compute it by itself, @@ -595,22 +611,27 @@ (define-public current-guix-package (make-parameter #f)) (define-public current-guix - (let* ((repository-root (delay (canonicalize-path - (string-append (current-source-directory) - "/../..")))) - (select? (delay (or (git-predicate (force repository-root)) - source-file?)))) - (lambda () - "Return a package representing Guix built from the current source tree. -This works by adding the current source tree to the store (after filtering it -out) and returning a package that uses that as its 'source'." + (lambda () + "Return a package representing Guix built from the currently used one. +This works by either looking up profile or build metadata, and building from +the current Guix channel. If that metadata is missing, assume we are running +from a Git checkout, so add the current source tree to the store (after +filtering it out) and return a package that uses that as its 'source'." + (let* ((guix-channel (find guix-channel? (current-channels))) + (repository-root (canonicalize-path + (string-append (current-source-directory) + "/../.."))) + (select? (or (git-predicate repository-root) + source-file?))) (or (current-guix-package) + (and guix-channel + (channel->package guix-channel)) (package (inherit guix) (version (string-append (package-version guix) "+")) - (source (local-file (force repository-root) "guix-current" + (source (local-file repository-root "guix-current" #:recursive? #t - #:select? (force select?)))))))) + #:select? select?))))))) (define-public guix-icons (package diff --git a/guix/channels.scm b/guix/channels.scm index 01f63d9631..c930fd2ae7 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -94,6 +94,7 @@ (define-module (guix channels) channel-instances->derivation ensure-forward-channel-update + channel-build-system channel-profile-build-system profile-channels @@ -955,6 +956,28 @@ (define* (latest-channel-derivation #:optional (channels %default-channels) validate-pull))) (channel-instances->derivation instances))) +(define channel-build-system + ;; Build system used to "convert" a channel to a package. + (let* ((build (lambda* (name inputs + #:key channel system + #:allow-other-keys) + (mlet* %store-monad ((instance + ((store-lift latest-channel-instance) + channel + #:authenticate? #f + #:validate-pull (lambda (. rest) #t)))) + (build-from-source instance #:system system)))) + (lower (lambda* (name #:key system channel + #:allow-other-keys) + (bag + (name name) + (system system) + (build build) + (arguments `(#:channel ,channel)))))) + (build-system (name 'channel) + (description "Turn a channel into a package.") + (lower lower)))) + (define channel-profile-build-system ;; Build system used to "convert" a channel instance to a profile, in ;; package form. -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 04:29:39 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 09:29:39 +0000 Received: from localhost ([127.0.0.1]:39735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfu-0006El-Po for submit@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:38 -0500 Received: from jpoiret.xyz ([206.189.101.64]:37146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJXfs-0006EX-NA for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 04:29:37 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id A7FB91851E1; Mon, 14 Feb 2022 09:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644830976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5c3IO7Ny1RLcTbNkaztPXCoNXK9S2GXqxyIDGJ31FU=; b=wnGx9TSoKEZ9+j4msNOdu3jzrUWjHPcGnk+IaFYJvX9LGjU7YwwtiFCRoLlrMwaFMwSAEj tEAvQXvpapqmkosSvy92G1GkPKd5MqFCcY2Fh855HMjmvsQPwnCViE/YdOVJn+SJ8RTfHv aPqcBOzqudx9V5+8R3yad4HAJQETpiIdAwrmdF8epL9B6uU6BjOUObRFbhRw2ua6dQBj4L SnWZoRaN5hZLufSdU5bfZR8p6GwMvp7si0EICpjmUix/8UzvyPihUGvHuovvzP/dUn58oh k7qnFCdS1WuE7qvqhp3wZV9X/+IEXx9WjcAIjTYjMLbqqmAI5DUhZfOnAe+KLw== From: Josselin Poiret To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Mathieu Othacehe Subject: [WIP PATCH 4/4] gnu: package-management: Memoize current-guix. Date: Mon, 14 Feb 2022 10:29:08 +0100 Message-Id: <20220214092908.16801-5-dev@jpoiret.xyz> In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/package-management.scm (current-guix): Memoize. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fe906fd440..a7b98bbb1a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-manageme [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/package-management.scm (current-guix): Memoize. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fe906fd440..a7b98bbb1a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-manageme [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/package-management.scm (current-guix): Memoize. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fe906fd440..a7b98bbb1a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -125,6 +125,7 @@ (define-module (gnu packages package-management) #:use-module (guix git-download) #:autoload (guix git) (git-checkout) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -611,7 +612,7 @@ (define-public current-guix-package (make-parameter #f)) (define-public current-guix - (lambda () + (mlambda () "Return a package representing Guix built from the currently used one. This works by either looking up profile or build metadata, and building from the current Guix channel. If that metadata is missing, assume we are running -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 12:10:59 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 17:10:59 +0000 Received: from localhost ([127.0.0.1]:42446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJesN-0000Rp-3p for submit@debbugs.gnu.org; Mon, 14 Feb 2022 12:10:59 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:48932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJesL-0000Rb-IP for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 12:10:58 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id DFED6B50; Mon, 14 Feb 2022 18:10:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sBA8XLopHxpI; Mon, 14 Feb 2022 18:10:50 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CA57A2D0; Mon, 14 Feb 2022 18:10:49 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: [WIP PATCH 0/4] Make current-guix work when run outside a Git checkout References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 26 =?utf-8?Q?Pluvi=C3=B4se?= an 230 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, 14 Feb 2022 18:10:49 +0100 In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 14 Feb 2022 10:29:04 +0100") Message-ID: <877d9xv0fa.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: DFED6B50 X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, Thanks for working on it! Josselin Poiret skribis: Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Mathieu Othacehe , 53210@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.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, Thanks for working on it! Josselin Poiret skribis: Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello, Thanks for working on it! Josselin Poiret skribis: > This is only a WIP as there are some unresolved things: I've disabled > authentication, since I'm currently testing my own unsigned patches. > Should we indiscriminately enable it? This would cause some issues > for people that have their own 'guix channel. Maybe we could enable > authentication if the channel URL is the default one? How about adding a keyword argument to =E2=80=98channel-build-system=E2=80= =99, defaulting to true? > Also, when I tried to replace the guix in the installer by > (current-guix), it ended up building the Guix derivation multiple > times, even though the package is memoized and the package->derivation > process should be cached. =E2=80=98current-guix=E2=80=99 returns a fresh package object every time it= =E2=80=99s called: (define-public current-guix (lambda () =E2=80=A6 (package =E2=80=A6))) This defeats the object-to-derivation cache, which relies on object identity (eq?). So yes, you definitely have to turn it into =E2=80=98mlamb= da=E2=80=99. Why that=E2=80=99s no enough, I don=E2=80=99t know. > There's a bit of rift between what the ci uses (renamed here to > channel-profile-build-system) and what current-guix uses, since the > former builds a profile as a package, whereas the latter simply builds > the derivation for the 'guix channel. This avoids creating profile > collisions when the package is added to the system profile, but it > also means we don't get the package cache generation. As discussed on IRC, I think the file-level collisions are fine: unless I=E2=80=99m mistaken, it=E2=80=99s the =E2=80=98manifest=E2=80=99 file of t= he real profile that =E2=80=9Cwins=E2=80=9D, so it doesn=E2=80=99t really matter that the =E2=80=98guix=E2=80=99 package= also provides a =E2=80=98manifest=E2=80=99 file. What=E2=80=99s more problematic though is that it means that =E2=80=9C/run/current-system/profile/bin/guix describe=E2=80=9D would now f= ail (I think? Can you confirm?) since it gets its provenance data from the profile it=E2=80=99s in. WDYT? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 12:12:18 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 17:12:18 +0000 Received: from localhost ([127.0.0.1]:42450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJete-0000UC-GY for submit@debbugs.gnu.org; Mon, 14 Feb 2022 12:12:18 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:48970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJetc-0000Tz-Ui for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 12:12:17 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 857F81CA; Mon, 14 Feb 2022 18:12:11 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ahKMSNiDdBuX; Mon, 14 Feb 2022 18:12:11 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id B9926B6D; Mon, 14 Feb 2022 18:12:10 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: [WIP PATCH 1/4] gnu: ci: Move generic channel building code. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <20220214092908.16801-2-dev@jpoiret.xyz> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 26 =?utf-8?Q?Pluvi=C3=B4se?= an 230 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, 14 Feb 2022 18:12:10 +0100 In-Reply-To: <20220214092908.16801-2-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 14 Feb 2022 10:29:05 +0100") Message-ID: <8735klv0d1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 857F81CA X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Josselin Poiret skribis: > * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. > (channel-source->package): Move to > gnu/packages/package-management.scm. > * guix/channels.scm (channel-build-system): Moved from g [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Mathieu Othacehe , 53210@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.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Josselin Poiret skribis: > * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. > (channel-source->package): Move to > gnu/packages/package-management.scm. > * guix/channels.scm (channel-build-system): Moved from g [...] Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Josselin Poiret skribis: > * gnu/ci.scm (channel-build-system): Move to guix/channels.scm. > (channel-source->package): Move to > gnu/packages/package-management.scm. > * guix/channels.scm (channel-build-system): Moved from gnu/ci.scm. > * gnu/packages/package-management.scm (channel-source->package): Moved > from gnu/ci.scm. > * etc/system-tests.scm: Use module (gnu packages package-management) > instead of (gnu ci). How about making it (guix build-system channel), to be consistent with other build systems? From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 14 12:15:23 2022 Received: (at 53210) by debbugs.gnu.org; 14 Feb 2022 17:15:23 +0000 Received: from localhost ([127.0.0.1]:42454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJewc-0000Z6-UO for submit@debbugs.gnu.org; Mon, 14 Feb 2022 12:15:23 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:49104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJewb-0000Yv-Gv for 53210@debbugs.gnu.org; Mon, 14 Feb 2022 12:15:21 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 19DD43DB; Mon, 14 Feb 2022 18:15:16 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dtBXlN-fXsUw; Mon, 14 Feb 2022 18:15:15 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 4056D2D0; Mon, 14 Feb 2022 18:15:15 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: [WIP PATCH 3/4] gnu: current-guix: Support when running outside a checkout. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <20220214092908.16801-4-dev@jpoiret.xyz> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 26 =?utf-8?Q?Pluvi=C3=B4se?= an 230 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, 14 Feb 2022 18:15:14 +0100 In-Reply-To: <20220214092908.16801-4-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 14 Feb 2022 10:29:07 +0100") Message-ID: <87wnhxtlnh.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 19DD43DB X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Josselin Poiret skribis: > * guix/channels.scm (channel-build-system): Add build system that > turns a channel record into a package. > * gnu/packages/package-management.scm (current-guix): Use > channel-build-system. Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 53210 Cc: Mathieu Othacehe , 53210@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.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Josselin Poiret skribis: > * guix/channels.scm (channel-build-system): Add build system that > turns a channel record into a package. > * gnu/packages/package-management.scm (current-guix): Use > channel-build-system. Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Josselin Poiret skribis: > * guix/channels.scm (channel-build-system): Add build system that > turns a channel record into a package. > * gnu/packages/package-management.scm (current-guix): Use > channel-build-system. [...] > (define-public current-guix > - (let* ((repository-root (delay (canonicalize-path > - (string-append (current-source-directo= ry) > - "/../..")))) > - (select? (delay (or (git-predicate (force repository-root)) > - source-file?)))) > - (lambda () > - "Return a package representing Guix built from the current source = tree. > -This works by adding the current source tree to the store (after filteri= ng it > -out) and returning a package that uses that as its 'source'." > + (lambda () > + "Return a package representing Guix built from the currently used on= e. > +This works by either looking up profile or build metadata, and building = from > +the current Guix channel. If that metadata is missing, assume we are ru= nning > +from a Git checkout, so add the current source tree to the store (after > +filtering it out) and return a package that uses that as its 'source'." > + (let* ((guix-channel (find guix-channel? (current-channels))) > + (repository-root (canonicalize-path > + (string-append (current-source-directory) > + "/../.."))) > + (select? (or (git-predicate repository-root) > + source-file?))) We should keep these two variables as promises in the closure, to make sure we don=E2=80=99t recompute them over and over=E2=80=A6 unless =E2=80= =98lambda=E2=80=99 is changed to =E2=80=98mlambda=E2=80=99 in the same commit, which is probably the best= course of action. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 18 15:35:57 2022 Received: (at 53210) by debbugs.gnu.org; 18 Jul 2022 19:35:57 +0000 Received: from localhost ([127.0.0.1]:52148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDWX7-0002oY-C4 for submit@debbugs.gnu.org; Mon, 18 Jul 2022 15:35:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDWX5-0002oJ-3Z for 53210@debbugs.gnu.org; Mon, 18 Jul 2022 15:35:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDWWz-0006rS-P2; Mon, 18 Jul 2022 15:35:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=9KMNQCqwifNliwa1EmZAPsDT8lxxc4kCn1dshz4Gs3I=; b=cvNTZSyAPaKjsADu7PXI 4DSGHuuXCcoseTeu5Rndx8g7LdsYc7XYcdku/bQsHpcdra5EMbGeQYC3xAekBNNJPlQllXULCis1D gETT2YZOAU4H1n5CWgoFcgM3GBkRLAgArbSRwmf5A6Ifu7MNoi+AHxVHrCd9zsaRtcP9MibxIQ3FP CsyTjB7HffL1DYGVdou07OeJwnEV3b7sW9fHYPQLv+MMXMqcSiEw/R/qM3b6GUR7GXVZKfVgYAUc1 X+vKOz+1/YckUZ1zVhFIbBvLCmwEfUEEgDOAhVysdgQ6oobiZy+2yMqIVLwmfyX9Tfxx7BX0nAzpv StZcxf6Jh1jvJg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:51366 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDWWy-00068Z-Ps; Mon, 18 Jul 2022 15:35:49 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <20220214092908.16801-3-dev@jpoiret.xyz> Date: Mon, 18 Jul 2022 21:35:46 +0200 In-Reply-To: <20220214092908.16801-3-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 14 Feb 2022 10:29:06 +0100") Message-ID: <87k08axlgt.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 53210 Cc: Mathieu Othacehe , 53210@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.3 (-) Josselin Poiret skribis: > -(define channel-build-system > - ;; Build system used to "convert" a channel instance to a package. > +(define channel-profile-build-system > + ;; Build system used to "convert" a channel instance to a profile, in > + ;; package form. In hindsight I=E2=80=99m not convinced about this rename; I don=E2=80=99t t= hink adding =E2=80=9Cprofile=E2=80=9D brings much. WDYT? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 09:26:39 2022 Received: (at 53210) by debbugs.gnu.org; 9 Aug 2022 13:26:39 +0000 Received: from localhost ([127.0.0.1]:42884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLPFY-0006yS-82 for submit@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLPFV-0006y1-3C for 53210@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLPFP-0008Cg-Rr; Tue, 09 Aug 2022 09:26:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=jsl2bVwUI3l/GnvuOvc84MZ/rMVVvEdX0rbW7/8D5P0=; b=TfmxZ7VklaPLILfwkFqx kxaKCrOP+YbxUS69ocPAU69tb6/a+S5a4vVDN/aMGRQUEfWdMmLdWDN78k1T+idtmW/T/VCvHkbzD v9Sp28/IsIyOqUNuNFgb5GNu1bIz0AdGsP4S36pttlBjefxlEBWYG2++gqAIeXi5kPeRwuO3FE52U bnWze8/MOXdCMXM6RKavNNF1KzVemVR/WreXwUyOpQL8Ac3sRXBSGJMhsORJi0zp4ja1gfc5Me67y qOGRZ71DoSYeXvLtueCjKXcYrJMT++5hsAGvifabGwwCAjJZy+GLmb9NO+fqyrANLjsDWaNM5W5z/ W4ip43Zf8LJ2GQ==; Received: from [193.50.110.201] (port=35942 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLPFP-0004q6-EU; Tue, 09 Aug 2022 09:26:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> Date: Tue, 09 Aug 2022 15:26:12 +0200 In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 14 Feb 2022 10:29:04 +0100") Message-ID: <87v8r17dl7.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (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: 53210 Cc: Mathieu Othacehe , 53210@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 Josselin & all, I ended up pushing the following patches: fdafd40432 maint: Use a pretty version string in ISO and VM images. 95a03aa5c5 system: install: Always use 'current-guix'. 57f1892d36 gnu: guix: Default 'current-guix' is built using the current c= hannels. 64a070717c channels: Add 'repository->guix-channel'. cf60a0a906 build-system/channel: Accept a channel or instance as the sour= ce. 5bce4c8242 build-system: Add 'channel-build-system'. The basics are similar to what you had posted. It adds a useful default for =E2=80=98current-guix=E2=80=99: a package built from the =E2=80=98guix= =E2=80=99 channel as returned by =E2=80=98guix describe=E2=80=99. In turn, =E2=80=98%installation-os=E2= =80=99 in (gnu system install) is changed to use (current-guix) instead of the =E2=80=98guix=E2=80=99 pack= age, meaning that: guix system image gnu/system/install.scm and: ./pre-inst-env guix system image gnu/system/install.scm both produce an image that contains the current Guix. That allows us to remove the second =E2=80=98update-guix-package.scm=E2=80= =99 + =E2=80=98git commit=E2=80=99 invocation in =E2=80=98make release=E2=80=99, which should = make the whole process faster. Note that the default for installed systems remains the =E2=80=98guix=E2=80= =99 package, not (current-guix). The main reason is that the =E2=80=9CComputing derivat= ion=E2=80=9D step when using (current-guix) is too high to do that by default. We could mitigate that by caching the result of that step more systematically, but I think that can come later. Let me know if you have comments! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 09:26:39 2022 Received: (at control) by debbugs.gnu.org; 9 Aug 2022 13:26:39 +0000 Received: from localhost ([127.0.0.1]:42888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLPFn-0006yp-Ch for submit@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLPFm-0006yd-Kw for control@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLPFh-0008FD-EN for control@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=9fgzIgq1SkK7+qcYTE3abH8Zx2qdLsaJ6NF50QGEt/M=; b=LL2rR+T4AqriYB xQWT2cV+ydmyJ6RTNpyXf79MyLfSvp82CkmbuoFOSNyRtpOmNu16RlXNAQgpicH68mOpiO3Dy/f4I xJ8NrIR8/U8SDKpSBCP4rEPTnbA+bHxVnqWYv/jpISa7JkvFhDxOoMu2GksrOYgp8EarQfAHpAwH2 dZFkRFTaCelqmnC4Hq2GZmizaYme2CIqq5ApHgHSpB39DXxmOhlXboFfN3xiaEp0SshVpuLNiHFMh GLCoJOUi9qlsXVjkOBK63j1NP4U13Uyu7Yc4wfwxCiSqL6Tky/OwTYz8sPJdQvwT+7TauOTXjbBnE SdrQ7bi/TkHkXZW0o0gw==; Received: from [193.50.110.201] (port=53158 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLPFh-0004uz-1I for control@debbugs.gnu.org; Tue, 09 Aug 2022 09:26:33 -0400 Date: Tue, 09 Aug 2022 15:26:31 +0200 Message-Id: <87tu6l7dko.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #53210 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) close 53210 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 15:17:54 2022 Received: (at 53210) by debbugs.gnu.org; 9 Aug 2022 19:17:54 +0000 Received: from localhost ([127.0.0.1]:45079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUji-0006JG-DG for submit@debbugs.gnu.org; Tue, 09 Aug 2022 15:17:54 -0400 Received: from jpoiret.xyz ([206.189.101.64]:54724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUjg-0006J4-CC for 53210@debbugs.gnu.org; Tue, 09 Aug 2022 15:17:53 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 33BA01851DF; Tue, 9 Aug 2022 19:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1660072670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NCezhTMvgyXP0BQ3f3iM42cOo4FXdYR733KIUhWzttE=; b=RNrQvh+rLMe2ENrYerNQNOIQ/vghWrVxnkvsSa9+q4haep2hzJh+9OS1GenYPulRiks82L IPCMWZSlx64uo4somv0EInFXWOkNs9ruaxlAihCrM52d2ZixwYkaLfGPMyi/NBRnlG1ZGu L3g6ptA0xtUAF1YU28gSRBLRUoMTtTfimjYCDKAHe6ESOVfE7I91509EvAzU6nWZdX8jXY ym83qa5OvZmvnVqp9ahQKTwJRDwIhr+i96tDTjT5wv0j3JBswfwjNPqLejE8gF8a64tP0S iYQfJarU9zp7IFZ9bOmgZKlx3zjD4uzxvfvV9PhyPUMKkiX+ynlwt1wXFnOvVA== From: Josselin Poiret To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. In-Reply-To: <87v8r17dl7.fsf_-_@gnu.org> References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <87v8r17dl7.fsf_-_@gnu.org> Date: Tue, 09 Aug 2022 21:17:48 +0200 Message-ID: <87fsi5jkf7.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Ludo, Sorry for the delay, I was on holidays for the past few weeks. Ludovic Courtès writes: Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 53210 Cc: Mathieu Othacehe , 53210@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: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Ludo, Sorry for the delay, I was on holidays for the past few weeks. Ludovic Courtès writes: Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Ludo, Sorry for the delay, I was on holidays for the past few weeks. Ludovic Court=C3=A8s writes: > Hi Josselin & all, > > I ended up pushing the following patches: > > fdafd40432 maint: Use a pretty version string in ISO and VM images. > 95a03aa5c5 system: install: Always use 'current-guix'. > 57f1892d36 gnu: guix: Default 'current-guix' is built using the current= channels. > 64a070717c channels: Add 'repository->guix-channel'. > cf60a0a906 build-system/channel: Accept a channel or instance as the so= urce. > 5bce4c8242 build-system: Add 'channel-build-system'. Great, thanks for adopting my code and fixing it up! > Let me know if you have comments! > > Thanks, > Ludo=E2=80=99. --=20 Josselin Poiret From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 10 06:13:25 2022 Received: (at 53210) by debbugs.gnu.org; 10 Aug 2022 10:13:25 +0000 Received: from localhost ([127.0.0.1]:46173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLiiL-0001rr-GE for submit@debbugs.gnu.org; Wed, 10 Aug 2022 06:13:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLiiJ-0001re-PH for 53210@debbugs.gnu.org; Wed, 10 Aug 2022 06:13:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLiiD-0001tq-On; Wed, 10 Aug 2022 06:13:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=7uHQWhLX47QkEOnD7lstykasOqBZlJeULDC+CzfyPiw=; b=B7Q+uYZVRoGoreVtwWWv qsVW1BdUAhFUvonkWdctoRDz2GcacC9qlR6GgTD8zzMlq0vxcA6AmOI0a8T0Nv3nbr2wmisKv9fhE psfoGSQnDcecvNyGuq6rV5KcXvbDMRizT+wqDaa0kjaBeJeoclkOCQ0jDh96gygfgEHk9yOxLt2zk HlNK1si6H1f3pPBwdTMliA9UWdpu0EKRZ8cWL6iwMHQeBMhQGhWcPpOiox0sYGlvWApkFbtWP3UMk eBaaYLnEjTMBhyMlhmYbeeS+u8suwfweyTu1+0aTPzOqSSLOZfde1AqURz8DqsvXTV7Cv2VuPMvZT 5kL96AfEbRUAlA==; Received: from 2a02-8429-81d2-3d01-94c9-8097-ea5c-2775.rev.sfr.net ([2a02:8429:81d2:3d01:94c9:8097:ea5c:2775]:54566 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLiiD-0006yH-1y; Wed, 10 Aug 2022 06:13:17 -0400 From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <87v8r17dl7.fsf_-_@gnu.org> Date: Wed, 10 Aug 2022 12:13:14 +0200 In-Reply-To: <87v8r17dl7.fsf_-_@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s?= =?utf-8?Q?=22's?= message of "Tue, 09 Aug 2022 15:26:12 +0200") Message-ID: <87zggcmmo5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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 (---) Hey, > Let me know if you have comments! Thanks for taking care of this! Looks like we have a small regression on 'system-tests and 'guix specifications: https://ci.guix.gnu.org/eval/528053/log/raw https://ci.guix.gnu.org/eval/528056/log/raw I think this is because channel-source->package is given a raw directory as source in (gnu ci) while this procedure expects either a channel or a lowerable object. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 11 10:03:40 2022 Received: (at 53210) by debbugs.gnu.org; 11 Aug 2022 14:03:40 +0000 Received: from localhost ([127.0.0.1]:54709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM8mh-0007bv-Ps for submit@debbugs.gnu.org; Thu, 11 Aug 2022 10:03:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM8mg-0007bh-JY for 53210@debbugs.gnu.org; Thu, 11 Aug 2022 10:03:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM8mU-00033W-64; Thu, 11 Aug 2022 10:03:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=o0FnId2/gxe+n/18j013BpAHHF/gXtH0mQOZGb1FVUQ=; b=scpi2645Pkl0ePL6qBEq Qb2Vyl2xcB9dYQOVHfVTAEbs10D7JgppNo6F/cflGQmpGx+CDxMDvKZd8S/quUZuWFFwZAPYK2T1l ZRi9cAzkq/MgzlEARG/dKNeR3vCjKi9cnhPEyx/xXCPAn/l3bZtWZvD9gJL53KcuVZgoNU/boxNms ZjGaXJmW/xcbPXuOLhqEiyoeaJZK08v1OG0iq7Sa51RXgXpChhGCOXzVJ527Kr7SwmfsPjxFT+YiI 6xrXgmPvx7nS/T7eJwhr9lRXlqDyC78X+xqVWUCTgzhtvON+9huwdBdWoBk9MrzXAOODOxLZk/LsN +Wu8Yyn8qeqQWQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=56728 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM8mP-0007s8-JR; Thu, 11 Aug 2022 10:03:24 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Mathieu Othacehe Subject: Re: bug#53210: installer: referring to N-1 guix is problematic. References: <87lezkrgvj.fsf@gnu.org> <20220214092908.16801-1-dev@jpoiret.xyz> <87v8r17dl7.fsf_-_@gnu.org> <87zggcmmo5.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 24 Thermidor an 230 de la =?utf-8?Q?R=C3=A9?= =?utf-8?Q?volution=2C?= jour de =?utf-8?Q?l'Aun=C3=A9e?= 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, 11 Aug 2022 16:03:20 +0200 In-Reply-To: <87zggcmmo5.fsf@gnu.org> (Mathieu Othacehe's message of "Wed, 10 Aug 2022 12:13:14 +0200") Message-ID: <87leruubbr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53210 Cc: Josselin Poiret , 53210@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 (---) Hello, Mathieu Othacehe skribis: >> Let me know if you have comments! > > Thanks for taking care of this! > > Looks like we have a small regression on 'system-tests and 'guix > specifications: > > https://ci.guix.gnu.org/eval/528053/log/raw > https://ci.guix.gnu.org/eval/528056/log/raw > > I think this is because channel-source->package is given a raw directory > as source in (gnu ci) while this procedure expects either a channel or a > lowerable object. Indeed. This should be fixed by a81706494753ad84754cbb7583ccc783452decc0. Thanks! Ludo'. From unknown Sun Aug 17 01:47:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 09 Sep 2022 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator