From: Josselin Poiret via Bug reports for GNU Guix <bug-guix@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>, "Mathieu Othacehe" <othacehe@gnu.org>
Cc: Josselin Poiret <dev@jpoiret.xyz>, 53210@debbugs.gnu.org
Subject: bug#53210: [WIP PATCH 2/4] gnu: Rename channel-build-system and channel-source->package.
Date: Mon, 14 Feb 2022 10:29:06 +0100 [thread overview]
Message-ID: <20220214092908.16801-3-dev@jpoiret.xyz> (raw)
In-Reply-To: <20220214092908.16801-1-dev@jpoiret.xyz>
* 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
next prev parent reply other threads:[~2022-02-14 9:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 16:23 bug#53210: installer: referring to N-1 guix is problematic Mathieu Othacehe
2022-01-12 17:41 ` Ludovic Courtès
2022-02-14 9:29 ` bug#53210: [WIP PATCH 0/4] Make current-guix work when run outside a Git checkout Josselin Poiret via Bug reports for GNU Guix
2022-02-14 9:29 ` bug#53210: [WIP PATCH 1/4] gnu: ci: Move generic channel building code Josselin Poiret via Bug reports for GNU Guix
2022-02-14 17:12 ` Ludovic Courtès
2022-02-14 9:29 ` Josselin Poiret via Bug reports for GNU Guix [this message]
2022-07-18 19:35 ` bug#53210: installer: referring to N-1 guix is problematic Ludovic Courtès
2022-02-14 9:29 ` bug#53210: [WIP PATCH 3/4] gnu: current-guix: Support when running outside a checkout Josselin Poiret via Bug reports for GNU Guix
2022-02-14 17:15 ` Ludovic Courtès
2022-02-14 9:29 ` bug#53210: [WIP PATCH 4/4] gnu: package-management: Memoize current-guix Josselin Poiret via Bug reports for GNU Guix
2022-02-14 17:10 ` bug#53210: [WIP PATCH 0/4] Make current-guix work when run outside a Git checkout Ludovic Courtès
2022-08-09 13:26 ` bug#53210: installer: referring to N-1 guix is problematic Ludovic Courtès
2022-08-09 19:17 ` Josselin Poiret via Bug reports for GNU Guix
2022-08-10 10:13 ` Mathieu Othacehe
2022-08-11 14:03 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220214092908.16801-3-dev@jpoiret.xyz \
--to=bug-guix@gnu.org \
--cc=53210@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=ludo@gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).