[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: gexp: Remove workarounds for <https://bugs.gnu.org/15602>.
From: |
guix-commits |
Subject: |
10/11: gexp: Remove workarounds for <https://bugs.gnu.org/15602>. |
Date: |
Thu, 4 Apr 2019 11:49:21 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit c1ef50ac79ff56bebe81a173a858d83a1bee6a36
Author: Ludovic Courtès <address@hidden>
Date: Thu Apr 4 17:28:00 2019 +0200
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).
---
gnu/services/base.scm | 10 ----------
guix/scripts/pack.scm | 6 +-----
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 04b123b..246932e 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 e5502ef..d2ef68d 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)
- branch master updated (660e0050 -> 985730c), guix-commits, 2019/04/04
- 01/11: build: Always ship the (gnu installer …) modules., guix-commits, 2019/04/04
- 03/11: gnu: java-jgit: Move to java.scm., guix-commits, 2019/04/04
- 06/11: gnu: raincat: Move to haskell-apps.scm., guix-commits, 2019/04/04
- 05/11: gnu: ghc-tls: Move to haskell-crypto.scm., guix-commits, 2019/04/04
- 11/11: scripts: More commands default to verbosity level 1., guix-commits, 2019/04/04
- 04/11: gnu: Move ghc-hxt & co. to haskell-web.scm., guix-commits, 2019/04/04
- 10/11: gexp: Remove workarounds for <https://bugs.gnu.org/15602>.,
guix-commits <=
- 09/11: gexp: 'compiled-modules' loads modules before compiling them., guix-commits, 2019/04/04
- 02/11: gnu: Add (gnu packages haskell-apps)., guix-commits, 2019/04/04
- 07/11: gnu: Mov ghc-sdl2 & co. to haskell-apps.scm., guix-commits, 2019/04/04
- 08/11: gnu: Move nss & co. to nss.scm., guix-commits, 2019/04/04