me/guix
Archived
1
0
Fork 0
Code Activity

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

17
doc/build.scm
View file

@ -182,11 +182,12 @@ content=\"width=device-width, initial-scale=1\" />"))
;; Guile-Lib with a hotfix for (htmlprag). ;; Guile-Lib with a hotfix for (htmlprag).
(package (package
(inherit guile-lib) (inherit guile-lib)
(source (origin (arguments
(inherit (package-source guile-lib)) (substitute-keyword-arguments (package-arguments guile-lib)
(modules '(( guix build utils))) ((#:phases phases '%standard-phases)
(snippet `(modify-phases ,phases
'(begin (add-before 'build 'fix-htmlprag
(lambda _
;; When parsing ;; When parsing
;; "<body><blockquote><p>foo</p>\n</blockquote></body>", ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
;; 'html->shtml' would mistakenly close 'blockquote' right ;; 'html->shtml' would mistakenly close 'blockquote' right
@ -195,11 +196,7 @@ content=\"width=device-width, initial-scale=1\" />"))
(substitute* "src/htmlprag.scm" (substitute* "src/htmlprag.scm"
(("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*") (("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
"")) ""))
#t)))) #t))
(arguments
(substitute-keyword-arguments (package-arguments guile-lib)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'skip-known-failure (add-before 'check 'skip-known-failure
(lambda _ (lambda _
;; XXX: The above change causes one test failure among ;; XXX: The above change causes one test failure among