me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hpcguix-web: Update to 0.1.0.

Browse source 
* gnu/packages/web.scm (hpcguix-web): Update to 0.1.0.
[arguments]: In 'wrap-program' phase, change "/bin/run" to
"/bin/hpcguix-web".
[inputs]: Add BASH-MINIMAL.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Run
"/bin/hpcguix-web".
This commit is contained in:
Ludovic Courtès 2021-07-23 16:08:55 +02:00
parent b48bc8953d
commit 1665bb0cec
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 79 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
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, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 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 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 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>
@ -95,6 +95,7 @@
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages bittorrent) #:use-module (gnu packages bittorrent)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
@ -7693,20 +7694,18 @@ compressed JSON header blocks.
(license license:expat))) (license license:expat)))
(define-public hpcguix-web (define-public hpcguix-web
(let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74")
(revision "5"))
(package (package
(name "hpcguix-web") (name "hpcguix-web")
(version (git-version "0.0.1" revision commit)) (version "0.1.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/UMCUGenetics/hpcguix-web") (url "https://github.com/UMCUGenetics/hpcguix-web")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wjgj2s7v2cyz6dx24c111rxs99i84sfvxl4ch8brnh02j2606jz")))) "02lz5k1hhkwfz3nr3lsd69icsz6n0q82z047d3svi09qpxw6y0cj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -7720,8 +7719,7 @@ compressed JSON header blocks.
(lambda _ (lambda _
;; This prevents a few warnings ;; This prevents a few warnings
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")
(setenv "XDG_CACHE_HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -7751,11 +7749,9 @@ compressed JSON header blocks.
"/site-ccache") "/site-ccache")
deps) deps)
":"))) ":")))
(wrap-program (string-append out "/bin/run") (wrap-program (string-append out "/bin/hpcguix-web")
`("GUILE_LOAD_PATH" ":" prefix (,path)) `("GUILE_LOAD_PATH" ":" prefix (,path))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))))))))
#t))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -7763,7 +7759,8 @@ compressed JSON header blocks.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(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'
(propagated-inputs (propagated-inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("guile-commonmark" ,guile-commonmark) ("guile-commonmark" ,guile-commonmark)
@ -7773,7 +7770,7 @@ compressed JSON header blocks.
(description "Hpcguix-web provides a web interface to the list of packages (description "Hpcguix-web provides a web interface to the list of packages
provided by Guix. The list of packages is searchable and provides provided by Guix. The list of packages is searchable and provides
instructions on how to use Guix in a shared HPC environment.") instructions on how to use Guix in a shared HPC environment.")
(license license:agpl3+)))) (license license:agpl3+)))
(define-public httrack (define-public httrack
(package (package

4
gnu/services/web.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
@ -1163,7 +1163,7 @@ a webserver.")
(provision '(hpcguix-web)) (provision '(hpcguix-web))
(requirement '(networking)) (requirement '(networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$(file-append hpcguix-web "/bin/run") (list #$(file-append hpcguix-web "/bin/hpcguix-web")
(string-append "--config=" (string-append "--config="
#$(scheme-file "hpcguix-web.scm" specs))) #$(scheme-file "hpcguix-web.scm" specs)))
#:user "hpcguix-web" #:user "hpcguix-web"