diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-09-27 11:57:28 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-27 17:55:53 +0200 |
| commit | 7c5f01d55634254bea8bad4c9dcc31496efd4fce (patch) | |
| tree | 800625411b7df57179093b0548d584ffb4394009 /gnu/ci.scm | |
| parent | 4bd69850df42cedaa0a0f25d89e23889fb4637d0 (diff) | |
ci: Adjust 'channel-build-system' to monadic style.
* gnu/ci.scm (channel-build-system): Adjust to new monadic style.
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index 15a4815ff41..b65c45d47a7 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm | |||
| @@ -301,20 +301,16 @@ otherwise use the IMAGE name." | |||
| 301 | 301 | ||
| 302 | (define channel-build-system | 302 | (define channel-build-system |
| 303 | ;; Build system used to "convert" a channel instance to a package. | 303 | ;; Build system used to "convert" a channel instance to a package. |
| 304 | (let* ((build (lambda* (store name inputs | 304 | (let* ((build (lambda* (name inputs |
| 305 | #:key source commit system | 305 | #:key source commit system |
| 306 | #:allow-other-keys) | 306 | #:allow-other-keys) |
| 307 | (run-with-store store | 307 | (mlet* %store-monad ((source (if (string? source) |
| 308 | ;; SOURCE can be a lowerable object such as <local-file> | 308 | (return source) |
| 309 | ;; or a file name. Adjust accordingly. | 309 | (lower-object source))) |
| 310 | (mlet* %store-monad ((source (if (string? source) | 310 | (instance |
| 311 | (return source) | 311 | -> (checkout->channel-instance |
| 312 | (lower-object source))) | 312 | source #:commit commit))) |
| 313 | (instance | 313 | (channel-instances->derivation (list instance))))) |
| 314 | -> (checkout->channel-instance | ||
| 315 | source #:commit commit))) | ||
| 316 | (channel-instances->derivation (list instance))) | ||
| 317 | #:system system))) | ||
| 318 | (lower (lambda* (name #:key system source commit | 314 | (lower (lambda* (name #:key system source commit |
| 319 | #:allow-other-keys) | 315 | #:allow-other-keys) |
| 320 | (bag | 316 | (bag |