From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kBxVITchCmKPFwEAgWs5BA (envelope-from ) for ; Mon, 14 Feb 2022 10:30:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UKTdHjchCmJpuQAA9RJhRA (envelope-from ) for ; Mon, 14 Feb 2022 10:30:31 +0100 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 9E7ED3A0BC for ; Mon, 14 Feb 2022 10:30:30 +0100 (CET) Received: from localhost ([::1]:51124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJXgj-0007uf-Po for larch@yhetil.org; Mon, 14 Feb 2022 04:30:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJXgK-0007YP-JJ for bug-guix@gnu.org; Mon, 14 Feb 2022 04:30:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJXgK-000618-8k for bug-guix@gnu.org; Mon, 14 Feb 2022 04:30:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nJXgK-0006GP-5v for bug-guix@gnu.org; Mon, 14 Feb 2022 04:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#53210: [WIP PATCH 2/4] gnu: Rename channel-build-system and channel-source->package. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 14 Feb 2022 09:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53210 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe Cc: Josselin Poiret , 53210@debbugs.gnu.org Received: via spool by 53210-submit@debbugs.gnu.org id=B53210.164483097123949 (code B ref 53210); Mon, 14 Feb 2022 09:30:04 +0000 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== 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 X-Spamd-Bar: / 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" Reply-to: Josselin Poiret From: Josselin Poiret via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644831030; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=r4T2ZRsPjobRkXLwUBY8qDG/GaAAgsVKNT/doBlYhU4=; b=EvF6y1zKop9kVgf7ZWIfvxwSfB7GDmkLxc9LaWA3bnL426+usBOOK5iiP9GDPCybkBdTSM KNGr+KvC3cYGapLMXjTRZlNRUKAav5ZwPYNt1CKlwqWQDs8BlK9OcNKTX1Tl2w6OYzg7G3 joyX+b1/8XtSETshPHb/DXxvkXX20p0KnTrB15GZMPp4qAylCbPqlTITjE5m4rC8XiefIh TZANfhPlCvW7FDF73ZIFNbE/6uPbmhjsVxjQ5wkGfgsirf1SB3+maDRg9lzVxPtaDcrCUp aIc3pia7BGTM/wF+AKQVQmF9G5UprFJoP/gjISu5T103MSJ8f4ebp0D4iJwVPQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644831030; a=rsa-sha256; cv=none; b=l+AryLAtqp7j3fyd6qNk0K9B2Xjy8UeMaPhTpKzRIaE+I8/u4OqBZFoCKyiBScdGpQXiVu 4jbaohXCWBJjyNWvIFzAzglcxxZ4uz6JKBD4uC2fIfTwIYmlOD4e1FMqqhmFmqLZp+F2hH pth/9d6LMDJpSG7944NFIakdxJMZGP8PbLrnIEW9sTXKpxCs09YB0j0QoDVWXXKVzr+/Sh qLCtYX05C+16aMIBDU7W0IEpVY2JWvBherQ7uSC0swTH2qIV04ttQGo9Js6/luhrpA810R HQtCM9lj+cxO4BJpCzdDiJo0b5FH57gkxJMXECsiFuorvuXPO9z57b0ZpX2ItA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=UOXjCcMG; dmarc=pass (policy=none) header.from=gnu.org; 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: -3.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=UOXjCcMG; dmarc=pass (policy=none) header.from=gnu.org; 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-Queue-Id: 9E7ED3A0BC X-Spam-Score: -3.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8pOxIUQc10Ye * 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