From e5b495c18fb9ba3858b75c25659be65f7bd9b0da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 12:10:04 +0200 Subject: doc: Inherit md5.scm fix in custom 'guile-lib' variant. * doc/build.scm (guile-lib/htmlprag-fixed)[source]: Remove. [arguments]: Add 'fix-htmlprag' phase. --- doc/build.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'doc/build.scm') diff --git a/doc/build.scm b/doc/build.scm index 2b6d0c4aea..def4bdf18a 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -182,30 +182,27 @@ content=\"width=device-width, initial-scale=1\" />")) ;; Guile-Lib with a hotfix for (htmlprag). (package (inherit guile-lib) - (source (origin - (inherit (package-source guile-lib)) - (modules '(( guix build utils))) - (snippet - '(begin - ;; When parsing - ;; "

foo
\n

", - ;; 'html->shtml' would mistakenly close 'blockquote' right - ;; before

. This patch removes 'p' from the - ;; 'parent-constraints' alist to fix that. - (substitute* "src/htmlprag.scm" - (("^[[:blank:]]*\$p[[:blank:]]+\\. \\(body td th\$\\).*") - "")) - #t)))) (arguments (substitute-keyword-arguments (package-arguments guile-lib) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'skip-known-failure - (lambda _ - ;; XXX: The above change causes one test failure among - ;; the htmlprag tests. - (setenv "XFAIL_TESTS" "htmlprag.scm") - #t)))))))) + (add-before 'build 'fix-htmlprag + (lambda _ + ;; When parsing + ;; "

foo
\n

", + ;; 'html->shtml' would mistakenly close 'blockquote' right + ;; before

. This patch removes 'p' from the + ;; 'parent-constraints' alist to fix that. + (substitute* "src/htmlprag.scm" + (("^[[:blank:]]*\$p[[:blank:]]+\\. \\(body td th\$\\).*") + "")) + #t)) + (add-before 'check 'skip-known-failure + (lambda _ + ;; XXX: The above change causes one test failure among + ;; the htmlprag tests. + (setenv "XFAIL_TESTS" "htmlprag.scm") + #t)))))))) (define* (syntax-highlighted-html input #:key -- cgit v1.2.3 From 8c23d7a15e90481f0b4ab2ba9bd178d68e7affaa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 17:24:54 +0200 Subject: doc: Remove one use of 'file-append*'. * doc/build.scm (texinfo-manual-source)[build]: Use 'file-append', not 'file-append*', for 'htmlxref.cnf', to ensure it has the right basename. --- doc/build.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/build.scm') diff --git a/doc/build.scm b/doc/build.scm index def4bdf18a..7256fb9bb5 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -141,7 +141,7 @@ as well as images, OS examples, and translations." (date->string date "~B ~Y") version version)))))) - (install-file #$(file-append* documentation "/htmlxref.cnf") + (install-file #$(file-append documentation "/htmlxref.cnf") #$output) (for-each (lambda (texi) -- cgit v1.2.3