ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc: Inherit md5.scm fix in custom 'guile-lib' variant.

Browse source 
* doc/build.scm (guile-lib/htmlprag-fixed)[source]: Remove.
[arguments]: Add 'fix-htmlprag' phase.
This commit is contained in:
Ludovic Courtès 2020-05-18 12:10:04 +02:00
parent 58024d86e1
commit e5b495c18f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
doc/build.scm
View file

@ -182,30 +182,27 @@ (define guile-lib/htmlprag-fixed
;; Guile-Lib with a hotfix for (htmlprag). ;; Guile-Lib with a hotfix for (htmlprag).
(package (package
(inherit guile-lib) (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 (arguments
(substitute-keyword-arguments (package-arguments guile-lib) (substitute-keyword-arguments (package-arguments guile-lib)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,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 (define* (syntax-highlighted-html input
#:key #:key