Use latest Guix channel, not the commit with substitutes available.

channel-with-substitutes-available only picks up on the commit with
substitutes available when the container is built. That means we will
be stuck with an old commit forever. This is not what we want. Better
to pick the latest commit, and build it ourselves if substitutes
aren't available.

1 files changed, 4 insertions, 8 deletions

diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index c242689..12a22d1 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -85,10 +85,6 @@
 (define %guix-daemon-uri
   "/var/host-guix/daemon-socket/socket")
 
-(define %default-guix-channel-with-substitutes
-  (channel-with-substitutes-available %default-guix-channel
-                                      "https://ci.guix.gnu.org"))
-
 ;; We cannot refer to sudo in the store since that sudo does not have
 ;; the setuid bit set. See "(guix) Setuid Programs".
 (define sudo
@@ -1141,7 +1137,7 @@ described by CONFIG, a <genenetwork-configuration> object."
                                 (name 'transform-genenetwork-database)
                                 (url (forge-project-repository this-forge-project))
                                 (branch "master"))
-                               %default-guix-channel-with-substitutes)
+                               %default-guix-channel)
                          #:guix-daemon-uri %guix-daemon-uri)))
                   (forge-laminar-job
                    (name "transform-genenetwork-database")
@@ -1187,7 +1183,7 @@ described by CONFIG, a <genenetwork-configuration> object."
                                 (name 'guile-lmdb)
                                 (url (forge-project-repository this-forge-project))
                                 (branch "master"))
-                               %default-guix-channel-with-substitutes)
+                               %default-guix-channel)
                          #:guix-daemon-uri %guix-daemon-uri)))))
    (ci-jobs-trigger 'webhook)))
 
@@ -1207,7 +1203,7 @@ described by CONFIG, a <genenetwork-configuration> object."
                                 (name 'guile-gsl)
                                 (url (forge-project-repository this-forge-project))
                                 (branch "master"))
-                               %default-guix-channel-with-substitutes)
+                               %default-guix-channel)
                          #:guix-daemon-uri %guix-daemon-uri)))))
    (ci-jobs-trigger 'webhook)))
 
@@ -1227,7 +1223,7 @@ described by CONFIG, a <genenetwork-configuration> object."
                                 (name 'guile-lapack)
                                 (url (forge-project-repository this-forge-project))
                                 (branch "master"))
-                               %default-guix-channel-with-substitutes)
+                               %default-guix-channel)
                          #:guix-daemon-uri %guix-daemon-uri)))))
    (ci-jobs-trigger 'webhook)))