mirror of
git://git.savannah.gnu.org/guix/data-service.git
synced 2023-12-14 03:23:03 +01:00
Catch the guix available when built
And use it for the hosting the inferiors, rather than computing the guix package at runtime. This simplifies the behaviour when the Guix Data Service is deployed as a Guix package.
This commit is contained in:
parent
6f379c7937
commit
11144a5fe9
3 changed files with 25 additions and 11 deletions
|
@ -35,6 +35,8 @@ guilemoduledir="${datarootdir}/guile/site/${GUILE_EFFECTIVE_VERSION}"
|
|||
AC_SUBST([guilemoduledir])
|
||||
AC_SUBST([GUILE_EFFECTIVE_VERSION])
|
||||
|
||||
AC_PATH_PROG([guix], [guix])
|
||||
|
||||
AC_PATH_PROG([sqitch], [sqitch])
|
||||
AC_PATH_PROG([psql], [psql])
|
||||
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
(host . "localhost")
|
||||
(port . 8765)
|
||||
|
||||
(guix . "@guix@")
|
||||
|
||||
(sqitch . "@sqitch@")
|
||||
(sqitch-psql . "@psql@")
|
||||
(sqitch-plan . ,(let ((installed-plan
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix-data-service config)
|
||||
#:use-module (guix-data-service model package)
|
||||
#:use-module (guix-data-service model git-repository)
|
||||
#:use-module (guix-data-service model guix-revision)
|
||||
|
@ -245,6 +246,15 @@
|
|||
(if (and store-path
|
||||
(file-exists? store-path))
|
||||
store-path
|
||||
(let ((config-guix (%config 'guix)))
|
||||
(if (and (file-exists? config-guix)
|
||||
(string-prefix? "/gnu/store/" config-guix))
|
||||
(begin
|
||||
(set! store-path
|
||||
(dirname
|
||||
(dirname
|
||||
(%config 'guix))))
|
||||
store-path)
|
||||
(begin
|
||||
(invalidate-derivation-caches!)
|
||||
(hash-clear! (@@ (guix packages) %derivation-cache))
|
||||
|
@ -256,7 +266,7 @@
|
|||
(let ((new-store-path
|
||||
(derivation->output-path derivation)))
|
||||
(set! store-path new-store-path)
|
||||
new-store-path)))))))
|
||||
new-store-path)))))))))
|
||||
|
||||
(define (nss-certs-store-path store)
|
||||
(let* ((nss-certs-package (@ (gnu packages certs)
|
||||
|
|
Loading…
Reference in a new issue