[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/13: hydra: Clear '%load-compiled-path' for gnu-system.scm.
From: |
Ludovic Courtès |
Subject: |
13/13: hydra: Clear '%load-compiled-path' for gnu-system.scm. |
Date: |
Sun, 8 Apr 2018 12:04:17 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f6dfb8bb082332e3e7450d09c71b32ad5f5042c7
Author: Ludovic Courtès <address@hidden>
Date: Sun Apr 8 17:57:13 2018 +0200
hydra: Clear '%load-compiled-path' for gnu-system.scm.
On hydra.gnu.org GUILE_LOAD_COMPILED_PATH happened to be empty so we
were fine. However on GuixSD with Cuirass, we could have a conflicting
non-empty path and .go files for some of the (guix …) and (gnu …)
modules would be taken from there.
* build-aux/hydra/gnu-system.scm: Set %load-compiled-path.
---
build-aux/hydra/gnu-system.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 8178871..e5326c4 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -32,6 +32,15 @@
;; Use our very own Guix modules.
(set! %fresh-auto-compile #t)
+ ;; Ignore .go files except for Guile's. This is because our checkout in the
+ ;; store has mtime set to the epoch, and thus .go files look newer, even
+ ;; though they may not correspond. Use 'reverse' so that /gnu/store/…-guile
+ ;; comes before /run/current-system/profile.
+ (set! %load-compiled-path
+ (list
+ (dirname (dirname (search-path (reverse %load-compiled-path)
+ "ice-9/boot-9.go")))))
+
(and=> (assoc-ref (current-source-location) 'filename)
(lambda (file)
(let ((dir (string-append (dirname file) "/../..")))
- branch master updated (8f3448f -> f6dfb8b), Ludovic Courtès, 2018/04/08
- 11/13: cuirass: Add job specs for the modular Guix., Ludovic Courtès, 2018/04/08
- 04/13: gexp: 'directory-union' has a #:resolve-collision parameter., Ludovic Courtès, 2018/04/08
- 13/13: hydra: Clear '%load-compiled-path' for gnu-system.scm.,
Ludovic Courtès <=
- 02/13: modules: Report the search path in &missing-dependency-error., Ludovic Courtès, 2018/04/08
- 07/13: build-self: Use (guix self)., Ludovic Courtès, 2018/04/08
- 10/13: cuirass: Factorize hydra-to-cuirass CI job translation., Ludovic Courtès, 2018/04/08
- 08/13: build: Add 'as-derivation' target., Ludovic Courtès, 2018/04/08
- 06/13: Add (guix self)., Ludovic Courtès, 2018/04/08
- 03/13: union: Allow callers to choose the collision resolution policy., Ludovic Courtès, 2018/04/08
- 09/13: discovery: Remove dependency on (guix ui)., Ludovic Courtès, 2018/04/08
- 01/13: tests: Skip 'pivot-root' test on Ubuntu's 4.4 kernels., Ludovic Courtès, 2018/04/08
- 12/13: hydra: 'guix-modular' jobs use the new 'build-self'., Ludovic Courtès, 2018/04/08
- 05/13: gnu: Add 'guix-register'., Ludovic Courtès, 2018/04/08