From 1665bb0ceca91be44816ef70691914d9c20664d6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 23 Jul 2021 16:08:55 +0200 Subject: gnu: hpcguix-web: Update to 0.1.0. * 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". --- gnu/packages/web.scm | 157 +++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 80 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2cc8619b19..21e47eb47a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal @@ -95,6 +95,7 @@ #:use-module (gnu packages apr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages bittorrent) #:use-module (gnu packages boost) @@ -7693,87 +7694,83 @@ compressed JSON header blocks. (license license:expat))) (define-public hpcguix-web - (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74") - (revision "5")) - (package - (name "hpcguix-web") - (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/UMCUGenetics/hpcguix-web") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wjgj2s7v2cyz6dx24c111rxs99i84sfvxl4ch8brnh02j2606jz")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26) - (ice-9 popen) - (ice-9 rdelim)) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-variables - (lambda _ - ;; This prevents a few warnings - (setenv "GUILE_AUTO_COMPILE" "0") - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (guix (assoc-ref inputs "guix")) - (guile (assoc-ref inputs "guile")) - (gcrypt (assoc-ref inputs "guile-gcrypt")) - (git (assoc-ref inputs "guile-git")) - (bs (assoc-ref inputs "guile-bytestructures")) - (json (assoc-ref inputs "guile-json")) - (guile-cm (assoc-ref inputs - "guile-commonmark")) - (deps (list guile gcrypt git bs guile-cm guix json)) - (effective - (read-line - (open-pipe* OPEN_READ - (string-append guile "/bin/guile") - "-c" "(display (effective-version))"))) - (path (string-join - (map (cut string-append <> - "/share/guile/site/" - effective) - deps) - ":")) - (gopath (string-join - (map (cut string-append <> - "/lib/guile/" effective - "/site-ccache") - deps) - ":"))) - (wrap-program (string-append out "/bin/run") - `("GUILE_LOAD_PATH" ":" prefix (,path)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))) - - #t)))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("uglify-js" ,uglify-js) - ("pkg-config" ,pkg-config))) - (inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) - ("guix" ,guix))) - (propagated-inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) - ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-4))) - (home-page "https://github.com/UMCUGenetics/hpcguix-web") - (synopsis "Web interface for cluster deployments of Guix") - (description "Hpcguix-web provides a web interface to the list of packages + (package + (name "hpcguix-web") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/UMCUGenetics/hpcguix-web") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02lz5k1hhkwfz3nr3lsd69icsz6n0q82z047d3svi09qpxw6y0cj")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26) + (ice-9 popen) + (ice-9 rdelim)) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-variables + (lambda _ + ;; This prevents a few warnings + (setenv "GUILE_AUTO_COMPILE" "0") + (setenv "XDG_CACHE_HOME" (getcwd)))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guix (assoc-ref inputs "guix")) + (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) + (git (assoc-ref inputs "guile-git")) + (bs (assoc-ref inputs "guile-bytestructures")) + (json (assoc-ref inputs "guile-json")) + (guile-cm (assoc-ref inputs + "guile-commonmark")) + (deps (list guile gcrypt git bs guile-cm guix json)) + (effective + (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (path (string-join + (map (cut string-append <> + "/share/guile/site/" + effective) + deps) + ":")) + (gopath (string-join + (map (cut string-append <> + "/lib/guile/" effective + "/site-ccache") + deps) + ":"))) + (wrap-program (string-append out "/bin/hpcguix-web") + `("GUILE_LOAD_PATH" ":" prefix (,path)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("uglify-js" ,uglify-js) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + ("guix" ,guix) + ("bash-minimal" ,bash-minimal))) ;for 'wrap-program' + (propagated-inputs + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + ("guile-commonmark" ,guile-commonmark) + ("guile-json" ,guile-json-4))) + (home-page "https://github.com/UMCUGenetics/hpcguix-web") + (synopsis "Web interface for cluster deployments of Guix") + (description "Hpcguix-web provides a web interface to the list of packages provided by Guix. The list of packages is searchable and provides instructions on how to use Guix in a shared HPC environment.") - (license license:agpl3+)))) + (license license:agpl3+))) (define-public httrack (package -- cgit v1.2.3 From 45881ea747bbff8f4819100264f70958f454090f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 01:53:34 +0200 Subject: gnu: perl-http-cookiejar: Update to 0.012. This fixes its build which had started to fail due to a time-bomb: Expires=Wed, 09 Jun 2021 10:18:14 GMT in an examples.t test cookie. * gnu/packages/web.scm (perl-http-cookiejar): Update to 0.012. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 21e47eb47a..e23272e25f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3482,14 +3482,14 @@ and multipart/form-data.") (define-public perl-http-cookiejar (package (name "perl-http-cookiejar") - (version "0.010") + (version "0.012") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "HTTP-CookieJar-" version ".tar.gz")) (sha256 - (base32 "1l7mqsca4fmls7agzwmp6yq1x16y9jwq4114i6i75n654gl37qsn")))) + (base32 "0jk0ps4i67dhhhwaxwwa9nkv3n6n5w44xlnwyzvk59735pwvyjh0")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) -- cgit v1.2.3 From a92dfbce30777de6ca05031e275410cf9f56c84c Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sat, 24 Jul 2021 18:42:58 -0700 Subject: gnu: gmnisrv: Update to 0-2.32854b7. Update to latest commit. gmnisrv uses v3 X509 certificates now, and so "requires fresh certificates, which could break clients with strict trust-on-first-use policies." gnu/packages/web.scm (gmnisrv): Update to 0-2.32854b7. Signed-off-by: Arun Isaac --- gnu/packages/web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e23272e25f..f229397db4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 la snesne ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -7965,8 +7966,8 @@ solution for any project's interface needs: (license license:expat))) (define-public gmnisrv - (let ((commit "d484ba0ab0020866535a44be5948c9482b8f2b8d") - (revision "1")) + (let ((commit "32854b79c73b278bf33eb5123abf1c36abdc7c01") + (revision "2")) (package (name "gmnisrv") (version (git-version "0" revision commit)) @@ -7978,7 +7979,7 @@ solution for any project's interface needs: (commit commit))) (sha256 (base32 - "11phipixsxx1jgm42agp76p5s68l0zj65kgb41vzaymgwcq79ivn")) + "0lbb3ablwkdcgm1cjr1hikr55y8gpl420nh8b8g9wn4abhm2xgr9")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 274fcfb2516b630daba814ae247f2e3c818cea9a Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 25 Jul 2021 13:39:52 -0700 Subject: gnu: gmnisrv: Disable tests using #:tests?. gnu/packages/web.scm (gmnisrv)[arguments]<#:phases>: Undelete check phase, and... <#:tests?>: ...disable tests here instead. Signed-off-by: Arun Isaac --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f229397db4..0ac13112c2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7983,13 +7983,13 @@ solution for any project's interface needs: (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:tests? #f ; no check target + #:phases (modify-phases %standard-phases (add-before 'configure 'set-variables (lambda _ (setenv "CC" "gcc") - #t)) - (delete 'check)))) + #t))))) (inputs `(("openssl" ,openssl))) (native-inputs -- cgit v1.2.3 From 3344f70e4998da639c299d9bd4ac252eb6e28d32 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 25 Jul 2021 13:39:53 -0700 Subject: gnu: gmnisrv: Use #:make-flags, and cross-compile. gnu/packages/web.scm (gmnisrv)[arguments]<#:phases>{set-variables}: Move 'CC=' to... <#:make-flags>: ...here, and support cross-compilation with (cc-for-target). Signed-off-by: Arun Isaac --- gnu/packages/web.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0ac13112c2..a00e101385 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7984,12 +7984,7 @@ solution for any project's interface needs: (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-variables - (lambda _ - (setenv "CC" "gcc") - #t))))) + #:make-flags (list (string-append "CC=" ,(cc-for-target))))) (inputs `(("openssl" ,openssl))) (native-inputs -- cgit v1.2.3 From b459c39adb725822916a8e21ee250fb408d2e2f8 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 25 Jul 2021 13:39:54 -0700 Subject: gnu: gmnisrv: Remove dependency on /etc/mime.types. Remove the dependency on /etc/mime.types (fixes #49233). gnu/packages/web.scm (gmnisrv)[arguments]<#:configure-flags>: Set --with-mimedb to directly use mime.types from mailcap. [propagated-inputs]: Move mailcap to... [inputs]: ...here (/etc/mime.types no longer need in profiles). Signed-off-by: Arun Isaac --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a00e101385..1472f9d572 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7984,14 +7984,16 @@ solution for any project's interface needs: (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target + #:configure-flags (list (string-append "--with-mimedb=" + (assoc-ref %build-inputs "mailcap") + "/etc/mime.types")) #:make-flags (list (string-append "CC=" ,(cc-for-target))))) (inputs - `(("openssl" ,openssl))) + `(("mailcap" ,mailcap) + ("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc))) - (propagated-inputs - `(("mailcap" ,mailcap))) (synopsis "Simple Gemini protocol server") (description "gmnisrv is a simple Gemini protocol server written in C.") (license (list license:gpl3+ -- cgit v1.2.3 From e17f063627f826b4dd0dda77ede48fc7a535414b Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 25 Jul 2021 13:39:55 -0700 Subject: gnu: gmnisrv: Fix configuration search path. Look in /etc for configuration files rather than /gnu/store/...-gmnisrv-.../etc. gnu/packages/web.scm (gmnisrv)[arguments]<#:configure-flags>: Set --sysconfdir. Signed-off-by: Arun Isaac --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1472f9d572..c59c4abb13 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7984,7 +7984,8 @@ solution for any project's interface needs: (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:configure-flags (list (string-append "--with-mimedb=" + #:configure-flags (list "--sysconfdir=/etc" + (string-append "--with-mimedb=" (assoc-ref %build-inputs "mailcap") "/etc/mime.types")) #:make-flags (list (string-append "CC=" ,(cc-for-target))))) -- cgit v1.2.3