Merge branch 'master' into staging

9 files changed, 23 insertions, 9 deletions

diff --git a/guix/grafts.scm b/guix/grafts.scm
index 63f384555b..db9c6854fd 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -144,7 +144,12 @@ are not recursively applied to dependencies of DRV."
                                                 ,@(append (map add-label sources)
                                                           (map add-label targets)))
                                      #:outputs outputs
+
+                                     ;; Grafts are computationally cheap so no
+                                     ;; need to offload or substitute.
                                      #:local-build? #t
+                                     #:substitutable? #f
+
                                      #:properties properties)))))
 (define (item->deriver store item)
   "Return two values: the derivation that led to ITEM (a store item), and the
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 5532c65eb6..0b7da3189e 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -65,7 +65,7 @@
 
 (define %default-log-urls
   ;; Default base URLs for build logs.
-  '("http://hydra.gnu.org/log"))
+  '("http://ci.guix.info/log"))
 
 ;; XXX: The following procedure cannot be in (guix store) because of the
 ;; dependency on (guix derivations).
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index f21311af09..7d0ecb0a4d 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -89,7 +89,7 @@ Display information about the channels currently in use.\n"))
 
 (define (channel->sexp channel)
   `(channel
-    (name ,(channel-name channel))
+    (name ',(channel-name channel))
     (url ,(channel-url channel))
     (commit ,(channel-commit channel))))
 
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 58fc64db1f..60e822b16b 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -278,7 +278,12 @@ the latest known version of ~a (~a)~%")
 
 (define (all-packages)
   "Return the list of all the distro's packages."
-  (fold-packages cons '()
+  (fold-packages (lambda (package result)
+                   ;; Ignore deprecated packages.
+                   (if (package-superseded package)
+                       result
+                       (cons package result)))
+                 '()
                  #:select? (const #t)))           ;include hidden packages
 
 (define (list-dependents packages)
diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm
index 344be40883..25218a2945 100644
--- a/guix/scripts/size.scm
+++ b/guix/scripts/size.scm
@@ -297,7 +297,7 @@ Report the size of PACKAGE and its dependencies.\n"))
          (leave (G_ "missing store item argument\n")))
         ((files ..1)
          (leave-on-EPIPE
-          ;; Turn off grafts because (1) hydra.gnu.org does not serve grafted
+          ;; Turn off grafts because (1) substitute servers do not serve grafted
           ;; packages, and (2) they do not make any difference on the
           ;; resulting size.
           (parameterize ((%graft? #f))
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index eb82224016..d6dc9b6448 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -1052,7 +1052,7 @@ found."
     (#f
      ;; This can only happen when this script is not invoked by the
      ;; daemon.
-     '("http://hydra.gnu.org"))))
+     '("http://ci.guix.info"))))
 
 (define substitute-urls
   ;; List of substitute URLs.
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index d92ec7d5a5..8eb32c62bc 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -497,9 +497,10 @@ STORE is an open connection to the store."
          (old-entries (map boot-parameters->menu-entry old-params)))
     (run-with-store store
       (mlet* %store-monad
-          ((bootcfg ((bootloader-configuration-file-generator bootloader)
-                     bootloader-config entries
-                     #:old-entries old-entries))
+          ((bootcfg (lower-object
+                     ((bootloader-configuration-file-generator bootloader)
+                      bootloader-config entries
+                      #:old-entries old-entries)))
            (bootcfg-file -> (bootloader-configuration-file bootloader))
            (target -> "/")
            (drvs -> (list bootcfg)))
diff --git a/guix/self.scm b/guix/self.scm
index 8476c422ec..f2db3dbf52 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -428,6 +428,9 @@ load path."
                    ,(file-append* source
                                   "/etc/substitutes/hydra.gnu.org.pub"))
                   ("share/guix/berlin.guixsd.org.pub"
+                   ,(file-append* source
+                                  "/etc/substitutes/berlin.guixsd.org.pub"))
+                  ("share/guix/ci.guix.info.pub"  ;alias
                    ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")))))
 
 (define* (whole-package name modules dependencies
diff --git a/guix/store.scm b/guix/store.scm
index 9dc651b26c..509fd4def6 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -693,7 +693,7 @@ encoding conversion errors."
   (map (if (false-if-exception (resolve-interface '(gnutls)))
            (cut string-append "https://" <>)
            (cut string-append "http://" <>))
-       '("mirror.hydra.gnu.org")))
+       '("ci.guix.info")))
 
 (define* (set-build-options server
                             #:key keep-failed? keep-going? fallback?