guix/data-service
2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/data-service.git synced 2023-12-14 03:23:03 +01:00
Code Issues Releases Wiki Activity

Collpase store-item-for-channel in to channel->guix-store-item

Browse source
This commit is contained in:
Christopher Baines 2020-02-09 21:06:12 +00:00
parent 13b0ebe561
commit 60d53f898f
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -884,16 +884,18 @@ WHERE job_id = $1"
(build-derivations store (list derivation))))
(derivation->output-path derivation)))
(define (channel->guix-store-item conn store channel)
(define (channel->guix-store-item conn channel)
(catch
#t
(lambda ()
(dirname
(readlink
(string-append (channel->manifest-store-item conn
store
channel)
"/bin"))))
(with-store store
(set-build-options store #:fallback? #t)
(dirname
(readlink
(string-append (channel->manifest-store-item conn
store
channel)
"/bin")))))
(lambda args
(simple-format #t "guix-data-service: load-new-guix-revision: error: ~A\n" args)
#f)))
@ -1177,13 +1179,6 @@ ORDER BY packages.name, packages.version"
#t)
(define (store-item-for-channel conn channel)
(with-store store
(set-build-options store #:fallback? #t)
(channel->guix-store-item conn
store
channel)))
(define (load-new-guix-revision conn git-repository-id commit)
(let* ((channel-for-commit
(channel (name 'guix)
@ -1192,7 +1187,7 @@ ORDER BY packages.name, packages.version"
git-repository-id))
(commit commit)))
(store-item
(store-item-for-channel conn channel-for-commit)))
(channel->guix-store-item conn channel-for-commit)))
(if store-item
(let ((guix-revision-id
(insert-guix-revision conn git-repository-id