mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gexp: Remove workarounds for <https://bugs.gnu.org/15602>.
* gnu/services/base.scm (hydra-key-authorization)[aaa]: Remove. [default-acl]: Don't import it. * guix/scripts/pack.scm (store-database)[build]: Don't import (gnu build install).
This commit is contained in:
parent
a31174e896
commit
c1ef50ac79
2 changed files with 1 additions and 15 deletions
|
@ -1515,19 +1515,9 @@ (define not-config?
|
||||||
(define (hydra-key-authorization keys guix)
|
(define (hydra-key-authorization keys guix)
|
||||||
"Return a gexp with code to register KEYS, a list of files containing 'guix
|
"Return a gexp with code to register KEYS, a list of files containing 'guix
|
||||||
archive' public keys, with GUIX."
|
archive' public keys, with GUIX."
|
||||||
(define aaa
|
|
||||||
;; XXX: Terrible hack to work around <https://bugs.gnu.org/15602>: this
|
|
||||||
;; forces (guix config) and (guix utils) to be loaded upfront, so that
|
|
||||||
;; their run-time symbols are defined.
|
|
||||||
(scheme-file "aaa.scm"
|
|
||||||
#~(define-module (guix aaa)
|
|
||||||
#:use-module (guix config)
|
|
||||||
#:use-module (guix memoization))))
|
|
||||||
|
|
||||||
(define default-acl
|
(define default-acl
|
||||||
(with-extensions (list guile-gcrypt)
|
(with-extensions (list guile-gcrypt)
|
||||||
(with-imported-modules `(((guix config) => ,(make-config.scm))
|
(with-imported-modules `(((guix config) => ,(make-config.scm))
|
||||||
((guix aaa) => ,aaa)
|
|
||||||
,@(source-module-closure '((guix pki))
|
,@(source-module-closure '((guix pki))
|
||||||
#:select? not-config?))
|
#:select? not-config?))
|
||||||
(computed-file "acl"
|
(computed-file "acl"
|
||||||
|
|
|
@ -126,13 +126,9 @@ (define labels
|
||||||
|
|
||||||
(define build
|
(define build
|
||||||
(with-extensions gcrypt-sqlite3&co
|
(with-extensions gcrypt-sqlite3&co
|
||||||
;; XXX: Adding (gnu build install) just to work around
|
|
||||||
;; <https://bugs.gnu.org/15602>: that way, (guix build store-copy) is
|
|
||||||
;; copied last and the 'store-info-XXX' macros are correctly expanded.
|
|
||||||
(with-imported-modules (source-module-closure
|
(with-imported-modules (source-module-closure
|
||||||
'((guix build store-copy)
|
'((guix build store-copy)
|
||||||
(guix store database)
|
(guix store database)))
|
||||||
(gnu build install)))
|
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix store database)
|
(use-modules (guix store database)
|
||||||
(guix build store-copy)
|
(guix build store-copy)
|
||||||
|
|
Loading…
Reference in a new issue