02/02: hydra/berlin: Use a newer version of the GWL.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 3c1d2cf6748a1bfb3aad1b95a6c9d59b082186d4
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Jan 6 23:16:41 2021 +0100

    hydra/berlin: Use a newer version of the GWL.
    
    * hydra/berlin.scm (gwl-next): New variable.
    <services>[gwl-web-service-type]: Use it.
---
 hydra/berlin.scm | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 27fb9d0..d860170 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -10,7 +10,7 @@
              (ice-9 match))
 (use-service-modules avahi base databases dns monitoring networking admin
                      shepherd ssh)
-(use-package-modules admin certs emacs linux mail monitoring
+(use-package-modules admin base certs emacs linux mail monitoring
                      ssh tls tor vim package-management
                      version-control
                      web wget ci rsync
@@ -136,6 +136,39 @@ Happy hacking!\n"))
                                                        ((#:tests? _ #f) #f)))))
                 ,@(alist-delete "guile-fibers" (package-inputs mumi)))))))
 
+(define-public gwl-next
+  (let ((commit "5b2f41a2c2e8163bba4551e8365b1268dfda3f01")
+        (revision "1"))
+    (package
+      (inherit gwl)
+      (name "gwl-next")
+      (version (git-version "0.2.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.savannah.gnu.org/git/gwl.git";)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0zl3hdajzjrkny7dspjx7a73hwy70qkfckr148xq3d0lk0xy0svd"))))
+      (arguments
+       `(#:make-flags
+         '("GUILE_AUTO_COMPILE=0")
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'build 'fix-tests
+             (lambda _
+               ;; Avoid cross-device link.
+               (substitute* "tests/cache.scm"
+                 (("/tmp") (getcwd)))
+               #t)))))
+      (inputs
+       `(("guile-config" ,guile-config)
+         ,@(package-inputs gwl)))
+      (native-inputs
+       `(("sed" ,sed)
+         ,@(package-native-inputs gwl))))))
 
 (define %build-node-key-directory
   ;; Directory containing the signing keys of build nodes.
@@ -348,7 +381,7 @@ Happy hacking!\n"))
                           ("GUIX_WEB_SITE_URL" . "/")))))
 
              ;; GWL web site.
-             (service gwl-web-service-type)
+             (service gwl-web-service-type gwl-next)
              (service mumi-service-type
                       (mumi-configuration
                        (mumi mumi-devel)