amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: web: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/web.scm
(krona-tools)[inputs]: Add 'bash-minimal'.
(guix-data-service)[inputs]: Likewise.
(ikiwiki): Delete trailing #t.
[inputs]: Likewise.
(hiawatha)[inputs]: Likewise.
(hpcguix-web)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I3fa7dbf05a72bc41a089ba62160dbe1fb82ec7e1
This commit is contained in:
Maxime Devos 2021-07-02 12:06:49 +02:00 • committed by Ludovic Courtès
parent 21d7434741
commit 31ca01e732
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/web.scm
View file

@ -1557,7 +1557,7 @@ efficiently. It gives the application developer no more than 4 methods.")
(invoke (string-append (assoc-ref outputs "out") "/bin/ktImportText") (invoke (string-append (assoc-ref outputs "out") "/bin/ktImportText")
"ec.tsv"))))))) "ec.tsv")))))))
(inputs (inputs
(list curl gnu-make perl)) (list bash-minimal curl gnu-make perl))
(home-page "https://github.com/marbl/Krona/wiki") (home-page "https://github.com/marbl/Krona/wiki")
(synopsis "Hierarchical data exploration with zoomable HTML5 pie charts") (synopsis "Hierarchical data exploration with zoomable HTML5 pie charts")
(description (description
@ -5266,7 +5266,8 @@ Cloud.")
(_ #t))))))) (_ #t)))))))
(delete 'strip)))) ; As the .go files aren't compatible (delete 'strip)))) ; As the .go files aren't compatible
(inputs (inputs
(list ephemeralpg (list bash-minimal
ephemeralpg
util-linux util-linux
postgresql-13 postgresql-13
sqitch sqitch
@ -5746,8 +5747,7 @@ NetSurf project.")
'(begin '(begin
;; The POT file requires write permission during the build ;; The POT file requires write permission during the build
;; phase. ;; phase.
(chmod "po/ikiwiki.pot" #o644) (chmod "po/ikiwiki.pot" #o644)))))
#t))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -5758,16 +5758,14 @@ NetSurf project.")
(("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)")) (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)"))
(with-directory-excursion "po" (with-directory-excursion "po"
(substitute* "Makefile" (substitute* "Makefile"
(("PERL5LIB=") "PERL5LIB=${PERL5LIB}:"))) (("PERL5LIB=") "PERL5LIB=${PERL5LIB}:")))))
#t))
(add-before 'build 'set-modification-times (add-before 'build 'set-modification-times
;; The wiki '--refresh' steps, which are executed during ;; The wiki '--refresh' steps, which are executed during
;; the check phase, require recent timestamps on files in ;; the check phase, require recent timestamps on files in
;; the 'doc' and 'underlays' directories. ;; the 'doc' and 'underlays' directories.
(lambda _ (lambda _
(invoke "find" "doc" "underlays" "-type" "f" "-exec" (invoke "find" "doc" "underlays" "-type" "f" "-exec"
"touch" "{}" "+") "touch" "{}" "+")))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Six tests use IPC::Run. For these tests the PERL5LIB ;; Six tests use IPC::Run. For these tests the PERL5LIB
@ -5793,8 +5791,7 @@ NetSurf project.")
(string-append (assoc-ref inputs "shared-mime-info") (string-append (assoc-ref inputs "shared-mime-info")
"/share")) "/share"))
;; CC is needed by IkiWiki/Wrapper.pm. ;; CC is needed by IkiWiki/Wrapper.pm.
(setenv "CC" "gcc") (setenv "CC" "gcc")))
#t))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -5803,8 +5800,7 @@ NetSurf project.")
(for-each (lambda (file) (for-each (lambda (file)
(wrap-program file (wrap-program file
`("PERL5LIB" ":" prefix (,path)))) `("PERL5LIB" ":" prefix (,path))))
(find-files bin)) (find-files bin))))))))
#t))))))
(native-inputs (native-inputs
(list which (list which
gettext-minimal gettext-minimal
@ -5814,7 +5810,8 @@ NetSurf project.")
cvs cvs
mercurial)) mercurial))
(inputs (inputs
(list python-wrapper (list bash-minimal
python-wrapper
perl-authen-passphrase perl-authen-passphrase
perl-cgi-simple perl-cgi-simple
perl-db-file perl-db-file
@ -6783,7 +6780,7 @@ functions of Tidy.")
`("PATH" ":" prefix (,mbed))))))))) `("PATH" ":" prefix (,mbed)))))))))
(inputs (inputs
;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha".
(list libxslt libxml2 mbedtls-for-hiawatha (list bash-minimal libxslt libxml2 mbedtls-for-hiawatha
`(,nghttp2 "lib") zlib)) `(,nghttp2 "lib") zlib))
(home-page "https://www.hiawatha-webserver.org") (home-page "https://www.hiawatha-webserver.org")
(synopsis "Webserver with focus on security") (synopsis "Webserver with focus on security")
@ -8586,7 +8583,8 @@ It does not support server push.")
(list autoconf automake uglify-js pkg-config (list autoconf automake uglify-js pkg-config
(lookup-package-native-input guix "guile"))) (lookup-package-native-input guix "guile")))
(inputs (inputs
(list (lookup-package-native-input guix "guile") (list bash-minimal
(lookup-package-native-input guix "guile")
guix guix
guile-zlib guile-zlib
guile-commonmark guile-commonmark