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