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

Fix using defined? to check for the open-inferior/container function

Browse source 
It doesn't work as intended unless the module is also specified, so do that.
This commit is contained in:
Christopher Baines 2019-07-09 19:48:01 +01:00
parent 502dc93618
commit 1b5db7adac
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -401,7 +401,9 @@
(derivation->output-path derivation))) (derivation->output-path derivation)))
(define (channel->derivation-file-name store channel) (define (channel->derivation-file-name store channel)
(define use-container? (defined? 'open-inferior/container)) (define use-container? (defined?
'open-inferior/container
(resolve-module '(guix inferior))))
(let ((inferior (let ((inferior
(if use-container? (if use-container?
@ -413,7 +415,9 @@
#:extra-environment-variables #:extra-environment-variables
(list (string-append (list (string-append
"SSL_CERT_DIR=" (nss-certs-store-path store)))) "SSL_CERT_DIR=" (nss-certs-store-path store))))
(open-inferior (guix-store-path store))))) (begin
(simple-format #t "debug: using open-inferior\n")
(open-inferior (guix-store-path store))))))
(catch (catch
#t #t
@ -511,11 +515,15 @@
(with-store store (with-store store
(set-build-options store (set-build-options store
#:fallback? #t) #:fallback? #t)
(let ((inf (if (defined? 'open-inferior/container) (let ((inf (if (defined?
'open-inferior/container
(resolve-module '(guix inferior)))
(open-inferior/container store store-path (open-inferior/container store store-path
#:extra-shared-directories #:extra-shared-directories
'("/gnu/store")) '("/gnu/store"))
(open-inferior store-path)))) (begin
(simple-format #t "debug: using open-inferior\n")
(open-inferior store-path)))))
(inferior-eval '(use-modules (srfi srfi-1) (inferior-eval '(use-modules (srfi srfi-1)
(srfi srfi-34) (srfi srfi-34)
(guix grafts) (guix grafts)