aboutsummaryrefslogtreecommitdiff
path: root/doc/build.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-05-18 12:10:04 +0200
committerLudovic Courtès <ludo@gnu.org>2020-05-18 15:08:58 +0200
commite5b495c18fb9ba3858b75c25659be65f7bd9b0da (patch)
treedd126a65d3b3221a79ec099470b877ab61e1d261 /doc/build.scm
parent58024d86e1c5b00567abfdb144fbff8cc2f6588e (diff)
downloadguix-e5b495c18fb9ba3858b75c25659be65f7bd9b0da.tar
guix-e5b495c18fb9ba3858b75c25659be65f7bd9b0da.tar.gz
doc: Inherit md5.scm fix in custom 'guile-lib' variant.
* doc/build.scm (guile-lib/htmlprag-fixed)[source]: Remove. [arguments]: Add 'fix-htmlprag' phase.
Diffstat (limited to 'doc/build.scm')
-rw-r--r--doc/build.scm37
1 files changed, 17 insertions, 20 deletions
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
- ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
- ;; 'html->shtml' would mistakenly close 'blockquote' right
- ;; before <p>. 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
+ ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
+ ;; 'html->shtml' would mistakenly close 'blockquote' right
+ ;; before <p>. 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