From 0ae85052889d47c4ede88bb34c4b00b3e557e1d9 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Tue, 28 Apr 2020 10:11:22 +0200 Subject: gnu: hpcguix-web: Use guile3.0-guix. * gnu/packages/web.scm (hpcguix-web): Update to latest revision and use guile3.0 inputs. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 16e2832a62..f5189dc7f9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7153,8 +7153,8 @@ compressed JSON header blocks. "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09")))))) (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)) @@ -7166,7 +7166,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) @@ -7222,11 +7222,11 @@ compressed JSON header blocks. ("uglify-js" ,uglify-js) ("pkg-config" ,pkg-config))) (inputs - `(("guix" ,guix))) + `(("guix" ,guile3.0-guix))) (propagated-inputs - `(("guile" ,guile-2.2) - ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-3))) + `(("guile" ,guile-next) + ("guile-commonmark" ,guile3.0-commonmark) + ("guile-json" ,guile3.0-json))) (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 -- cgit v1.2.3 From add3e168bb25e0af8a6225f5c93a311aae0268b2 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 24 Apr 2020 13:07:07 +0100 Subject: gnu: ikiwiki: Fetch sources from git repository. * gnu/packages/web.scm (ikiwiki)[source]: Use GIT-FETCH and GIT-FILE-NAME. [source](snippet): New field. [arguments]<#:phases>[set-modification-times]: New phase. --- gnu/packages/web.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f5189dc7f9..bfd8486dff 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4813,13 +4813,20 @@ NetSurf project.") (version "3.20190228") (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")))) + "1c0i48jp2vpiwn2pacr6jbjdj26v7s9vzzs7j7gc16bx37dfgbbi")) + (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 @@ -4838,6 +4845,14 @@ NetSurf project.") (substitute* "Makefile.PL" (("SYSCONFDIR\\?=") "SYSCONFDIR?=$(PREFIX)")) #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) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 732ffac3bc8131ce0b3baceccafac6b1fa63fee8 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 24 Apr 2020 20:46:15 +0100 Subject: gnu: ikiwiki: Build perl inputs for target architecture. * gnu/packages/web.scm (ikiwiki)[native-inputs]: Move perl dependencies ... [inputs]: ...to here. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bfd8486dff..37f2076bd1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4865,10 +4865,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) @@ -4883,11 +4879,15 @@ NetSurf project.") ("perl-db-file" ,perl-db-file) ("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) + ("perl-html-tagset" ,perl-html-tagset) ("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-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) + ("perl-xml-sax" ,perl-xml-sax) + ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") -- cgit v1.2.3 From b7392ecbbaa52eb54d9cefdccaa2af38d6b6fa62 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 27 Apr 2020 11:07:23 +0100 Subject: gnu: ikiwiki: Propagate some inputs. * gnu/packages/web.scm (ikiwiki)[inputs]: Move perl-html-parser, perl-html-scrubber, perl-html-template, perl-json, perl-text-markdown-discount, perl-uri and perl-yaml-libyaml to... [propagated-inputs]: ...here. New field. --- gnu/packages/web.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 37f2076bd1..21acfcea24 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4877,17 +4877,18 @@ NetSurf project.") ("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-html-scrubber" ,perl-html-scrubber) ("perl-html-tagset" ,perl-html-tagset) - ("perl-html-template" ,perl-html-template) ("perl-image-magick" ,perl-image-magick) + ("perl-timedate" ,perl-timedate) + ("perl-xml-sax" ,perl-xml-sax) + ("perl-xml-simple" ,perl-xml-simple))) + (propagated-inputs + `(("perl-html-parser" ,perl-html-parser) + ("perl-html-scrubber" ,perl-html-scrubber) + ("perl-html-template" ,perl-html-template) ("perl-json" ,perl-json) ("perl-text-markdown-discount" ,perl-text-markdown-discount) - ("perl-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) - ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") -- cgit v1.2.3 From cf47084a884c8cc76f81a0a396b84d56f8d01904 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 28 Apr 2020 16:13:55 +0100 Subject: gnu: ikiwiki: Add missing inputs. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-authen-passphrase, perl-file-mimeinfo, perl-mail-sendmail and perl-xml-twig. --- gnu/packages/web.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 21acfcea24..15410f945b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4873,15 +4873,19 @@ 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-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-simple" ,perl-xml-simple) + ("perl-xml-twig" ,perl-xml-twig))) (propagated-inputs `(("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) -- cgit v1.2.3 From 2933cdf88e2b978da7d3ea995931946a6581a8e7 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 28 Apr 2020 17:52:21 +0100 Subject: gnu: ikiwiki: Translate documentation. * gnu/packages/web.scm (ikiwiki)[inputs]: Add po4a. [arguments]<#:phases>[patch-Makefile]: Rename to... [arguments]<#:phases>[patch-Makefiles]: ...this. Add build environment paths to the PERL5LIB environment variable that is used by the 'po2wiki' script. --- gnu/packages/web.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 15410f945b..6bb8257c8d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4840,10 +4840,13 @@ 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 @@ -4885,7 +4888,8 @@ NetSurf project.") ("perl-timedate" ,perl-timedate) ("perl-xml-sax" ,perl-xml-sax) ("perl-xml-simple" ,perl-xml-simple) - ("perl-xml-twig" ,perl-xml-twig))) + ("perl-xml-twig" ,perl-xml-twig) + ("po4a" ,po4a))) (propagated-inputs `(("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) -- cgit v1.2.3 From da6539d17b6fe8c73ea06c2cad5327e1a91af6d3 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 28 Apr 2020 21:32:56 +0100 Subject: gnu: ikiwiki: Update to 3.20200202.3. * gnu/packages/web.scm (ikiwiki): Update to 3.20200202.3. --- 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 6bb8257c8d..092ff30148 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4810,7 +4810,7 @@ NetSurf project.") (define-public ikiwiki (package (name "ikiwiki") - (version "3.20190228") + (version "3.20200202.3") (source (origin (method git-fetch) @@ -4820,7 +4820,7 @@ NetSurf project.") (file-name (git-file-name name version)) (sha256 (base32 - "1c0i48jp2vpiwn2pacr6jbjdj26v7s9vzzs7j7gc16bx37dfgbbi")) + "0fphyqzlk9y8v9s89ypsmrnbhyymzrpc2w0liy0n4knc7kk2pabq")) (snippet '(begin ;; The POT file requires write permission during the build -- cgit v1.2.3