aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/services/base.scm10
-rw-r--r--guix/scripts/pack.scm6
2 files changed, 1 insertions, 15 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 04b123b833..246932e5c8 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1515,19 +1515,9 @@ GID."
(define (hydra-key-authorization keys guix)
"Return a gexp with code to register KEYS, a list of files containing '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
(with-extensions (list guile-gcrypt)
(with-imported-modules `(((guix config) => ,(make-config.scm))
- ((guix aaa) => ,aaa)
,@(source-module-closure '((guix pki))
#:select? not-config?))
(computed-file "acl"
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index e5502ef9ca..d2ef68d153 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -126,13 +126,9 @@ dependencies are registered."
(define build
(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
'((guix build store-copy)
- (guix store database)
- (gnu build install)))
+ (guix store database)))
#~(begin
(use-modules (guix store database)
(guix build store-copy)