diff options
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 58 |
1 files changed, 41 insertions, 17 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 03cb897c82..1797e52295 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4814,16 +4814,23 @@ NetSurf project.") (define-public ikiwiki (package (name "ikiwiki") - (version "3.20190228") + (version "3.20200202.3") (source (origin - (method url-fetch) - (uri (string-append "http://snapshot.debian.org/archive/debian/" - "20190301T035241Z/pool/main/i/ikiwiki/ikiwiki_" - version ".orig.tar.xz")) + (method git-fetch) + (uri (git-reference + (url "git://git.ikiwiki.info/") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh")))) + "0fphyqzlk9y8v9s89ypsmrnbhyymzrpc2w0liy0n4knc7kk2pabq")) + (snippet + '(begin + ;; The POT file requires write permission during the build + ;; phase. + (chmod "po/ikiwiki.pot" #o644) + #t)))) (build-system perl-build-system) (arguments `(#:phases @@ -4837,10 +4844,21 @@ NetSurf project.") " addenv(\"PERL5LIB\", \"" (getenv "PERL5LIB") "\");"))))) - (add-after 'patch-source-shebangs 'patch-Makefile + (add-after 'patch-source-shebangs 'patch-Makefiles (lambda _ (substitute* "Makefile.PL" - (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)")) + (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)")) + (with-directory-excursion "po" + (substitute* "Makefile" + (("PERL5LIB=") "PERL5LIB=${PERL5LIB}:"))) + #t)) + (add-before 'build 'set-modification-times + ;; The wiki '--refresh' steps, which are executed during + ;; the check phase, require recent timestamps on files in + ;; the 'doc' and 'underlays' directories. + (lambda _ + (invoke "find" "doc" "underlays" "-type" "f" "-exec" + "touch" "{}" "+") #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) @@ -4854,10 +4872,6 @@ NetSurf project.") #t)))))) (native-inputs `(("which" ,which) - ("perl-html-tagset" ,perl-html-tagset) - ("perl-timedate" ,perl-timedate) - ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("gettext" ,gettext-minimal) ("subversion" ,subversion) ("git" ,git) @@ -4866,14 +4880,24 @@ NetSurf project.") ("mercurial" ,mercurial))) (inputs `(("python" ,python-wrapper) + ("perl-authen-passphrase" ,perl-authen-passphrase) ("perl-cgi-formbuilder" ,perl-cgi-formbuilder) ("perl-cgi-session" ,perl-cgi-session) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) - ("perl-html-parser" ,perl-html-parser) + ("perl-file-mimeinfo" ,perl-file-mimeinfo) + ("perl-html-tagset" ,perl-html-tagset) + ("perl-image-magick" ,perl-image-magick) + ("perl-mail-sendmail" ,perl-mail-sendmail) + ("perl-timedate" ,perl-timedate) + ("perl-xml-sax" ,perl-xml-sax) + ("perl-xml-simple" ,perl-xml-simple) + ("perl-xml-twig" ,perl-xml-twig) + ("po4a" ,po4a))) + (propagated-inputs + `(("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) ("perl-html-template" ,perl-html-template) - ("perl-image-magick" ,perl-image-magick) ("perl-json" ,perl-json) ("perl-text-markdown-discount" ,perl-text-markdown-discount) ("perl-uri" ,perl-uri) @@ -7143,8 +7167,8 @@ compressed JSON header blocks. (license license:expat))) (define-public hpcguix-web - (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") - (revision "4")) + (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74") + (revision "5")) (package (name "hpcguix-web") (version (git-version "0.0.1" revision commit)) @@ -7156,7 +7180,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0idzzlwnaymk6hm5q9nh146h5m6vd8acp32vlmzp6qq08mimfkq7")))) + "0wjgj2s7v2cyz6dx24c111rxs99i84sfvxl4ch8brnh02j2606jz")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) |