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: Inherit md5.scm fix in custom 'guile-lib' variant.
e5b495c1 · Ludovic Courtès · 58024d86 · e5b495c1
Unverified Commit e5b495c1 authored 4 years ago by Ludovic Courtès
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -182,30 +182,27 @@ (define guile-lib/htmlprag-fixed
  ;; 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
+           (add-before 'build 'fix-htmlprag
-            (lambda _
+             (lambda _
-              ;; XXX: The above change causes one test failure among
+               ;; When parsing
-              ;; the htmlprag tests.
+               ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
-              (setenv "XFAIL_TESTS" "htmlprag.scm")
+               ;; 'html->shtml' would mistakenly close 'blockquote' right
-              #t))))))))
+               ;; 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