guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: hydra: Update Cuirass config to latest Guix changes.


From: Ludovic Courtès
Subject: 01/02: hydra: Update Cuirass config to latest Guix changes.
Date: Mon, 14 Jan 2019 04:33:15 -0500 (EST)

civodul pushed a commit to branch master
in repository maintenance.

commit 4354565ae60bd3f0a426a97cb90b216da56330e1
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 14 10:28:39 2019 +0100

    hydra: Update Cuirass config to latest Guix changes.
    
    This is a followup to Guix commit
    b5f8c2c88543158e8aca76aa98f9009f6b9e743a.  Since evaluation now takes
    place in an inferior, it's important that the Guix that builds that
    inferior has no interference from the Guix-to-build; IOW, we must not
    add the Guix-to-build to the load path.  Failing to do that can lead to
    errors such as patches not found, due to a faulty %PATCH-PATH that
    refers to the Guix-to-build.
    
    * hydra/modules/sysadmin/services.scm (cuirass-specs): Set
     #:load-path-inputs to the empty list for all the job sets.
---
 hydra/modules/sysadmin/services.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index 3159ef7..96e359d 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix system administration tools.
 ;;;
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This program is free software: you can redistribute it and/or modify
@@ -80,7 +80,7 @@
 (define (cuirass-specs systems)
   "Return the Cuirass specifications to build Guix for the given SYSTEMS."
   #~(list `((#:name . "guix-master")
-            (#:load-path-inputs . ("guix"))
+            (#:load-path-inputs . ())
             (#:package-path-inputs . ())
             (#:proc-input . "guix")
             (#:proc-file . "build-aux/cuirass/gnu-system.scm")
@@ -98,7 +98,7 @@
             (#:proc-args (systems address@hidden))
             (#:inputs . (#$(guix-input "guix-modular" "master"))))
           `((#:name . "staging-staging")
-            (#:load-path-inputs . ("staging"))
+            (#:load-path-inputs . ())
             (#:package-path-inputs . ())
             (#:proc-input . "staging")
             (#:proc-file . "build-aux/cuirass/gnu-system.scm")
@@ -106,7 +106,7 @@
             (#:proc-args (systems address@hidden))
             (#:inputs . (#$(guix-input "staging" "staging"))))
           `((#:name . "core-updates-core-updates")
-            (#:load-path-inputs . ("core-updates"))
+            (#:load-path-inputs . ())
             (#:package-path-inputs . ())
             (#:proc-input . "core-updates")
             (#:proc-file . "build-aux/cuirass/gnu-system.scm")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]