cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further refactor channel->derivation-file-name

Browse source 
To reduce the line length.
This commit is contained in:
Christopher Baines 2020-02-09 16:43:37 +00:00
parent 9c38115c3d
commit beab4babac
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -719,6 +719,24 @@ WHERE job_id = $1"
'open-inferior/container 'open-inferior/container
(resolve-module '(guix inferior)))) (resolve-module '(guix inferior))))
(define inferior-code
`(lambda (store)
(let ((instances
(list
(channel-instance
(channel (name ',(channel-name channel))
(url ,(channel-url channel))
(branch ,(channel-branch channel))
(commit ,(channel-commit channel)))
,(channel-instance-commit channel-instance)
,(channel-instance-checkout channel-instance)))))
(run-with-store store
(mlet* %store-monad ((manifest (channel-instances->manifest
instances))
(derv (profile-derivation manifest)))
(mbegin %store-monad
(return (derivation-file-name derv))))))))
(define (start-inferior-and-return-derivation-file-names) (define (start-inferior-and-return-derivation-file-names)
;; /etc is only missing if open-inferior/container has been used ;; /etc is only missing if open-inferior/container has been used
(when use-container? (when use-container?
@ -745,30 +763,15 @@ WHERE job_id = $1"
(@@ (guix channels) channel-instance)) (@@ (guix channels) channel-instance))
inferior) inferior)
(let ((file-name (let ((result
(inferior-eval-with-store (inferior-eval-with-store
inferior inferior
store store
`(lambda (store) inferior-code)))
(let ((instances
(list
(channel-instance
(channel (name ',(channel-name channel))
(url ,(channel-url channel))
(branch ,(channel-branch channel))
(commit ,(channel-commit channel)))
,(channel-instance-commit channel-instance)
,(channel-instance-checkout channel-instance)))))
(run-with-store store
(mlet* %store-monad ((manifest (channel-instances->manifest
instances))
(derv (profile-derivation manifest)))
(mbegin %store-monad
(return (derivation-file-name derv))))))))))
(close-inferior inferior) (close-inferior inferior)
file-name))) result)))
(let ((inferior (let ((inferior
(if use-container? (if use-container?