[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch version-1.1.0 updated: doc: Inherit md5.scm fix in custom 'guile-
From: |
guix-commits |
Subject: |
branch version-1.1.0 updated: doc: Inherit md5.scm fix in custom 'guile-lib' variant. |
Date: |
Mon, 29 Jun 2020 15:29:33 -0400 |
This is an automated email from the git hooks/post-receive script.
civodul pushed a commit to branch version-1.1.0
in repository guix.
The following commit(s) were added to refs/heads/version-1.1.0 by this push:
new 3601d81 doc: Inherit md5.scm fix in custom 'guile-lib' variant.
3601d81 is described below
commit 3601d8112c29debe0db350babcf982ff14fee0ba
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon May 18 12:10:04 2020 +0200
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(-)
diff --git a/doc/build.scm b/doc/build.scm
index 994b94e..59f7724 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch version-1.1.0 updated: doc: Inherit md5.scm fix in custom 'guile-lib' variant.,
guix-commits <=