branch master updated: hydra: bayfront: Update configuration for hpcguix-web 0.4.0.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 85f6511  hydra: bayfront: Update configuration for hpcguix-web 0.4.0.
85f6511 is described below

commit 85f6511a7382231cc3a3642ace16d9d8cb12b4d8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Dec 13 16:42:30 2023 +0100

    hydra: bayfront: Update configuration for hpcguix-web 0.4.0.
    
    * hydra/bayfront.scm (%hpcguix-web-channels): Add ‘guix-cran’.
    (%hpcguix-web-channel-descriptions): New variable.
    (%hpc.guix.info-nginx-servers): Add nginx location block for /channels.
    <hpcweb-configuration>: Add ‘main-page’ and ‘channel-descriptions’ fields.
---
 hydra/bayfront.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 95 insertions(+), 11 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index ad89dc2..f4e7ae0 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -143,7 +143,94 @@ Happy hacking!\n"))
                     (make-channel-introduction
                      "b1fe5aaff3ab48e798a4cce02f0212bc91f423dc"
                      (openpgp-fingerprint
-                      "CA4F 8CF4 37D7 478F DA05  5FD4 4213 7701 1A37 
8446")))))))
+                      "CA4F 8CF4 37D7 478F DA05  5FD4 4213 7701 1A37 8446"))))
+
+                  ;; XXX: 'gn-bioinformatics' commented out because its
+                  ;; '.guix-channel' file requests an old Guix commit not
+                  ;; compatible with what 'guix-science' expects.
+                  ;;
+                  ;; (channel
+                  ;;  (name 'gn-bioinformatics)
+                  ;;  (url "https://git.genenetwork.org/guix-bioinformatics";))
+
+                  (channel
+                   (name 'guix-cran)
+                   (url "https://github.com/guix-science/guix-cran.git";)))))
+
+(define %hpcguix-web-channel-descriptions
+  ;; Channel metadata displayed by hpcguix-web.
+  #~(let ((%inria-key "\
+(public-key
+ (ecc
+  (curve Ed25519)
+  (q #89FBA276A976A8DE2A69774771A92C8C879E0F24614AAAAE23119608707B3F06#)))")
+          (inria-cuirass-dashboard
+           (lambda (jobset)
+             (string-append
+              "https://guix.bordeaux.inria.fr/eval/latest/dashboard?spec=";
+              jobset)))
+          (inria-cuirass-badge
+           (lambda (jobset)
+             (string-append
+              "https://guix.bordeaux.inria.fr/jobset/"; jobset
+              "/badge.svg")))
+          (inria-package-cuirass-url
+           (lambda (jobset)
+             (lambda (package version)
+               (string-append
+                "https://guix.bordeaux.inria.fr/search?query=spec:"; jobset
+                "%20" package "-" version)))))
+      (list %guix-channel-description
+            (channel-description
+             (name 'guix-hpc)
+             (home-page "https://gitlab.inria.fr/guix-hpc/guix-hpc";)
+             (synopsis
+              "High-performance computing packages at 
@uref{https://www.inria.fr/en, Inria}")
+             (logo-url
+              
"https://gitlab.inria.fr/uploads/-/system/project/avatar/2095/guix-hpc-square.jpg?width=64";)
+             (ci-badge (inria-cuirass-badge "guix-hpc"))
+             (ci-url (inria-cuirass-dashboard "guix-hpc"))
+             (ci-package-url (inria-package-cuirass-url "guix-hpc"))
+             (substitutes `(("https://guix.bordeaux.inria.fr"; . ,%inria-key))))
+
+            (channel-description
+             (name 'guix-past)
+             (home-page "https://gitlab.inria.fr/guix-hpc/guix-past";)
+             (synopsis "Providing old package versions")
+             (logo-url
+              
"https://gitlab.inria.fr/uploads/-/system/project/avatar/19816/guix-bw.png?width=64";)
+             (ci-badge (inria-cuirass-badge "guix-past"))
+             (ci-url (inria-cuirass-dashboard "guix-past"))
+             (ci-package-url (inria-package-cuirass-url "guix-past"))
+             (substitutes `(("https://guix.bordeaux.inria.fr"; . ,%inria-key))))
+
+            (channel-description
+             (name 'guix-science)
+             (home-page "https://github.com/guix-science/guix-science";)
+             (synopsis "General scientific and statistics packages")
+             (ci-badge (inria-cuirass-badge "guix-science"))
+             (ci-url (inria-cuirass-dashboard "guix-science"))
+             (ci-package-url (inria-package-cuirass-url "guix-science"))
+             (substitutes `(("https://guix.bordeaux.inria.fr"; . ,%inria-key))))
+
+            (channel-description
+             (name 'guix-cran)
+             (home-page "https://github.com/guix-science/guix-cran";)
+             (synopsis
+              "Automated import of all the @uref{https://cran.r-project.org/, 
CRAN} packages")
+             (logo-url
+              
"https://github.com/guix-science/guix-cran-scripts/raw/master/logo.png";)
+             (ci-badge (inria-cuirass-badge "guix-cran"))
+             (ci-url (inria-cuirass-dashboard "guix-cran"))
+             (ci-package-url (inria-package-cuirass-url "guix-cran"))
+             (substitutes `(("https://guix.bordeaux.inria.fr"; . ,%inria-key))))
+
+            (channel-description
+             (name 'gn-bioinformatics)
+             (home-page "https://git.genenetwork.org/guix-bioinformatics/";)
+             (synopsis "Bioinformatics and HPC packages used by
+@uref{https://genenetwork.org/environments/, Genenetwork} at the University
+of Tennessee")))))
 
 
 ;;;
@@ -322,6 +409,9 @@ add_header X-Frame-Options SAMEORIGIN;\n")
           (nginx-location-configuration
            (uri "/channel/")
            (body '("proxy_pass http://localhost:5000;";)))
+          (nginx-location-configuration
+           (uri "/channels")
+           (body '("proxy_pass http://localhost:5000;";)))
 
           ;; JS for hpcguix-web
           (nginx-location-configuration
@@ -1192,21 +1282,15 @@ proxy_set_header  Via  $via;"
                    (hpcweb-configuration
                     (title-prefix "Guix-HPC — ")
                     (package-filter-proc (const #t))
-                    (package-page-extension-proc
-                     (lambda (path)
-                       (let ((url (string-append
-                                   "https://data.guix.gnu.org";
-                                   "/repository/1/branch/master/package/"
-                                   (basename path))))
-                         `(div
-                           (a (@ (href ,url))
-                              "View package version history.")))))
+                    (main-page "/browse")
                     (menu '(("/about"    "ABOUT")
                             ("/browse"   "PACKAGES")
                             ("/channels" "CHANNELS")
                             ("/events"   "EVENTS")
                             ("/blog"     "BLOG")))
-                    (channels #$%hpcguix-web-channels))))))
+                    (channels #$%hpcguix-web-channels)
+                    (channel-descriptions
+                     #$%hpcguix-web-channel-descriptions))))))
 
     (service certbot-service-type %certbot-configuration)