diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-05-18 12:10:04 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-29 21:22:39 +0200 |
| commit | 3601d8112c29debe0db350babcf982ff14fee0ba (patch) | |
| tree | 926beeb3a02745193d9cd472d9a33d361b065218 | |
| parent | f25e71e89f93e7b92f3036039665c1a79d802947 (diff) | |
| download | guix-3601d8112c29debe0db350babcf982ff14fee0ba.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.
| -rw-r--r-- | doc/build.scm | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/doc/build.scm b/doc/build.scm index 994b94eae2..59f7724a1e 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -178,30 +178,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 |