ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hpcguix-web: Update to 0.3.0.

Browse source 
* gnu/packages/web.scm (hpcguix-web): Update to 0.3.0.
[inputs]: Add GUILE-SYNTAX-HIGHLIGHT.
[arguments]: In 'wrap-program' phase, take guile-syntax-highlight into
account.
* gnu/tests/web.scm (%hpcguix-web-specs): Remove 'define'.
* doc/guix.texi (Web Services): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2023-01-22 17:58:11 +01:00
parent 15eda456a7
commit e1dbac04c3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/guix.texi
View file

@ -30322,14 +30322,15 @@ Data type for the hpcguix-web service configuration.
@table @asis @table @asis
@item @code{specs} @item @code{specs}
A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service
configuration. The main items available in this spec are: configuration as an @code{hpcguix-web-configuration} record. The main
fields of that record type are:
@table @asis @table @asis
@item @code{title-prefix} (default: @code{"hpcguix | "}) @item @code{title-prefix} (default: @code{"hpcguix | "})
The page title prefix. The page title prefix.
@item @code{guix-command} (default: @code{"guix"}) @item @code{guix-command} (default: @code{"guix"})
The @command{guix} command. The @command{guix} command to use in examples that appear on HTML pages.
@item @code{package-filter-proc} (default: @code{(const #t)}) @item @code{package-filter-proc} (default: @code{(const #t)})
A procedure specifying how to filter packages that are displayed. A procedure specifying how to filter packages that are displayed.
@ -30369,10 +30370,9 @@ A typical hpcguix-web service declaration looks like this:
(service hpcguix-web-service-type (service hpcguix-web-service-type
(hpcguix-web-configuration (hpcguix-web-configuration
(specs (specs
#~(define site-config #~(hpcweb-configuration
(hpcweb-configuration (title-prefix "Guix-HPC - ")
(title-prefix "Guix-HPC - ") (menu '(("/about" "ABOUT")))))))
(menu '(("/about" "ABOUT"))))))))
@end lisp @end lisp
@quotation Note @quotation Note

11
gnu/packages/web.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com>
@ -7710,7 +7710,7 @@ (define-public nghttp2
(define-public hpcguix-web (define-public hpcguix-web
(package (package
(name "hpcguix-web") (name "hpcguix-web")
(version "0.2.0") (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7719,7 +7719,7 @@ (define-public hpcguix-web
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1l856d1vr63ns1sp9fm6v97p71mx00769k6lwzqzppsb9clksnwp")))) "1g1sd5d6fhrblqk3rc8hzkk1sxyiilbb45kdgbrfg7ccd1sbic30"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -7744,9 +7744,11 @@ (define-public hpcguix-web
(bs (assoc-ref inputs "guile-bytestructures")) (bs (assoc-ref inputs "guile-bytestructures"))
(json (assoc-ref inputs "guile-json")) (json (assoc-ref inputs "guile-json"))
(zlib (assoc-ref inputs "guile-zlib")) (zlib (assoc-ref inputs "guile-zlib"))
(syntax (assoc-ref inputs "guile-syntax-highlight"))
(guile-cm (assoc-ref inputs (guile-cm (assoc-ref inputs
"guile-commonmark")) "guile-commonmark"))
(deps (list guile gcrypt git bs zlib guile-cm guix json)) (deps (list guile gcrypt git bs zlib guile-cm
syntax guix json))
(effective (effective
(read-line (read-line
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
@ -7776,6 +7778,7 @@ (define-public hpcguix-web
guile-zlib guile-zlib
guile-commonmark guile-commonmark
guile-json-4 guile-json-4
guile-syntax-highlight
bash-minimal)) bash-minimal))
(home-page "https://github.com/UMCUGenetics/hpcguix-web") (home-page "https://github.com/UMCUGenetics/hpcguix-web")
(synopsis "Web interface for cluster deployments of Guix") (synopsis "Web interface for cluster deployments of Guix")

7
gnu/tests/web.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2020-2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2020-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
@ -419,9 +419,8 @@ (define marionette
(define %hpcguix-web-specs (define %hpcguix-web-specs
;; Server config gexp. ;; Server config gexp.
#~(define site-config #~(hpcweb-configuration
(hpcweb-configuration (title-prefix "[TEST] HPCGUIX-WEB")))
(title-prefix "[TEST] HPCGUIX-WEB"))))
(define %hpcguix-web-os (define %hpcguix-web-os
(simple-operating-system (simple-operating-system