nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hydra: Fix uses of 'eval-when'. 

* build-aux/hydra/gnu-system.scm: Use (expand load eval) in 'eval-when'
clause so as to not poison a cat and to ensure %load-compiled-path is
properly set when the 'use-modules' clauses are expanded.
* build-aux/hydra/guix.scm: Likewise.
This commit is contained in:
Ludovic Courtès 2018-04-09 00:00:58 +02:00
parent 71dab08dec
commit df154c05dc
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/hydra/gnu-system.scm
View File

@ -24,7 +24,7 @@
(use-modules (system base compile)) (use-modules (system base compile))
(eval-when (compile load eval) (eval-when (expand load eval)
;; Pre-load the compiler so we don't end up auto-compiling it. ;; Pre-load the compiler so we don't end up auto-compiling it.
(compile #t) (compile #t)

4
build-aux/hydra/guix.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -22,7 +22,7 @@
;;; ;;;
;; Attempt to use our very own Guix modules. ;; Attempt to use our very own Guix modules.
(eval-when (compile load eval) (eval-when (expand load eval)
;; Ignore any available .go, and force recompilation. This is because our ;; Ignore any available .go, and force recompilation. This is because our
;; checkout in the store has mtime set to the epoch, and thus .go files look ;; checkout in the store has mtime set to the epoch, and thus .go files look