gnu: hpcguix-web: Update to 0.2.0.
* gnu/packages/web.scm (hpcguix-web): Update to 0.2.0. [arguments]: In 'wrap-program' phase, add guile-zlib to DEPS. [native-inputs]: Add GUILE. [inputs]: Add GUILE-ZLIB, GUILE-COMMONMARK, and GUILE-JSON. [propagated-inputs]: Remove. These were pointless. * gnu/services/web.scm (<hpcguix-web-configuration>)[address, port]: New fields. * doc/guix.texi (Web Services): Document them. * gnu/tests/web.scm (%hpcguix-web-os): Add 'address'.master
parent
782e9975dc
commit
21332f3b8c
|
@ -26552,6 +26552,12 @@ complete example}.
|
||||||
|
|
||||||
@item @code{package} (default: @code{hpcguix-web})
|
@item @code{package} (default: @code{hpcguix-web})
|
||||||
The hpcguix-web package to use.
|
The hpcguix-web package to use.
|
||||||
|
|
||||||
|
@item @code{address} (default: @code{"127.0.0.1"})
|
||||||
|
The IP address to listen to.
|
||||||
|
|
||||||
|
@item @code{port} (default: @code{5000})
|
||||||
|
The port number to listen to.
|
||||||
@end table
|
@end table
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|
||||||
|
|
|
@ -7668,7 +7668,7 @@ compressed JSON header blocks.
|
||||||
(define-public hpcguix-web
|
(define-public hpcguix-web
|
||||||
(package
|
(package
|
||||||
(name "hpcguix-web")
|
(name "hpcguix-web")
|
||||||
(version "0.1.0")
|
(version "0.2.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -7677,7 +7677,7 @@ compressed JSON header blocks.
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"02lz5k1hhkwfz3nr3lsd69icsz6n0q82z047d3svi09qpxw6y0cj"))))
|
"1l856d1vr63ns1sp9fm6v97p71mx00769k6lwzqzppsb9clksnwp"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build gnu-build-system)
|
`(#:modules ((guix build gnu-build-system)
|
||||||
|
@ -7701,9 +7701,10 @@ compressed JSON header blocks.
|
||||||
(git (assoc-ref inputs "guile-git"))
|
(git (assoc-ref inputs "guile-git"))
|
||||||
(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"))
|
||||||
(guile-cm (assoc-ref inputs
|
(guile-cm (assoc-ref inputs
|
||||||
"guile-commonmark"))
|
"guile-commonmark"))
|
||||||
(deps (list guile gcrypt git bs guile-cm guix json))
|
(deps (list guile gcrypt git bs zlib guile-cm guix json))
|
||||||
(effective
|
(effective
|
||||||
(read-line
|
(read-line
|
||||||
(open-pipe* OPEN_READ
|
(open-pipe* OPEN_READ
|
||||||
|
@ -7728,15 +7729,15 @@ compressed JSON header blocks.
|
||||||
`(("autoconf" ,autoconf)
|
`(("autoconf" ,autoconf)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("uglify-js" ,uglify-js)
|
("uglify-js" ,uglify-js)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)
|
||||||
|
("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
|
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
|
||||||
("guix" ,guix)
|
("guix" ,guix)
|
||||||
("bash-minimal" ,bash-minimal))) ;for 'wrap-program'
|
("guile-zlib" ,guile-zlib)
|
||||||
(propagated-inputs
|
|
||||||
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
|
|
||||||
("guile-commonmark" ,guile-commonmark)
|
("guile-commonmark" ,guile-commonmark)
|
||||||
("guile-json" ,guile-json-4)))
|
("guile-json" ,guile-json-4)
|
||||||
|
("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")
|
||||||
(description "Hpcguix-web provides a web interface to the list of packages
|
(description "Hpcguix-web provides a web interface to the list of packages
|
||||||
|
|
|
@ -1110,7 +1110,9 @@ a webserver.")
|
||||||
(package hpcguix-web-package (default hpcguix-web)) ;<package>
|
(package hpcguix-web-package (default hpcguix-web)) ;<package>
|
||||||
|
|
||||||
;; Specs is gexp of hpcguix-web configuration file
|
;; Specs is gexp of hpcguix-web configuration file
|
||||||
(specs hpcguix-web-configuration-specs))
|
(specs hpcguix-web-configuration-specs)
|
||||||
|
(address hpcguix-web-configuration-address (default "127.0.0.1"))
|
||||||
|
(port hpcguix-web-configuration-port (default 5000)))
|
||||||
|
|
||||||
(define %hpcguix-web-accounts
|
(define %hpcguix-web-accounts
|
||||||
(list (user-group
|
(list (user-group
|
||||||
|
@ -1163,6 +1165,12 @@ a webserver.")
|
||||||
(requirement '(networking))
|
(requirement '(networking))
|
||||||
(start #~(make-forkexec-constructor
|
(start #~(make-forkexec-constructor
|
||||||
(list #$(file-append hpcguix-web "/bin/hpcguix-web")
|
(list #$(file-append hpcguix-web "/bin/hpcguix-web")
|
||||||
|
(string-append "--listen="
|
||||||
|
#$(hpcguix-web-configuration-address
|
||||||
|
config))
|
||||||
|
"-p"
|
||||||
|
#$(number->string
|
||||||
|
(hpcguix-web-configuration-port config))
|
||||||
(string-append "--config="
|
(string-append "--config="
|
||||||
#$(scheme-file "hpcguix-web.scm" specs)))
|
#$(scheme-file "hpcguix-web.scm" specs)))
|
||||||
#:user "hpcguix-web"
|
#:user "hpcguix-web"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2017, 2020-2021 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>
|
||||||
|
@ -438,7 +438,8 @@ HTTP-PORT, along with php-fpm."
|
||||||
(service dhcp-client-service-type)
|
(service dhcp-client-service-type)
|
||||||
(service hpcguix-web-service-type
|
(service hpcguix-web-service-type
|
||||||
(hpcguix-web-configuration
|
(hpcguix-web-configuration
|
||||||
(specs %hpcguix-web-specs)))))
|
(specs %hpcguix-web-specs)
|
||||||
|
(address "0.0.0.0")))))
|
||||||
|
|
||||||
(define %test-hpcguix-web
|
(define %test-hpcguix-web
|
||||||
(system-test
|
(system-test
|
||||||
|
|
Reference in New Issue