ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/channel: Accept a channel or instance as the source.

Browse source 
* guix/build-system/channel.scm (latest-channel-instances*): New
variable.
(build-channels): New procedure, with code formerly in
'channel-build-system', augmented with clauses for when SOURCE is a
channel instance or a channel.
* doc/guix.texi (Build Systems): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2022-08-08 23:06:11 +02:00
parent 5bce4c8242
commit cf60a0a906
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/guix.texi
View file

@ -9571,10 +9571,14 @@ with @code{build-expression->derivation} (@pxref{Derivations,
@defvr {Scheme Variable} channel-build-system
This variable is exported by @code{(guix build-system channel)}.
This build system is meant primarily for internal use. It requires two
arguments, @code{#:commit} and @code{#:source}, and builds a Guix
instance from that channel, in the same way @command{guix time-machine}
would do it (@pxref{Channels}).
This build system is meant primarily for internal use. A package using
this build system must have a channel specification as its @code{source}
field (@pxref{Channels}); alternatively, its source can be a directory
name, in which case an additional @code{#:commit} argument must be
supplied to specify the commit being built (a hexadecimal string).
The resulting package is a Guix instance of the given channel, similar
to how @command{guix time-machine} would build it.
@end defvr
@node Build Phases

53
guix/build-system/channel.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019-2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build-system channel)
#:use-module ((guix store) #:select (%store-monad))
#:use-module ((guix store) #:select (%store-monad store-lift))
#:use-module ((guix gexp) #:select (lower-object))
#:use-module (guix monads)
#:use-module (guix channels)
@ -32,26 +32,39 @@ (define-module (guix build-system channel)
;;;
;;; Code:
(define latest-channel-instances*
(store-lift latest-channel-instances))
(define* (build-channels name inputs
#:key source system commit
(authenticate? #t)
#:allow-other-keys)
(mlet* %store-monad ((instances
(cond ((channel-instance? source)
(return (list source)))
((channel? source)
(latest-channel-instances*
(list source)
#:authenticate? authenticate?))
(else
(mlet %store-monad ((source
(lower-object source)))
(return
(list (checkout->channel-instance
source #:commit commit))))))))
(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))))))
(let ((lower (lambda* (name #:key system source commit (authenticate? #t)
#:allow-other-keys)
(bag
(name name)
(system system)
(build build-channels)
(arguments `(#:source ,source
#:authenticate? ,authenticate?
#:commit ,commit))))))
(build-system (name 'channel)
(description "Turn a channel instance into a package.")
(lower lower))))