forked from tribes/guix
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Ludovic Courtès
|
0c7c84407d | ||
|
Ludovic Courtès
|
3601d8112c | ||
|
Ludovic Courtès
|
f25e71e89f | ||
|
Ludovic Courtès
|
442fa22d9e |
+18
-21
@@ -137,7 +137,7 @@ as well as images, OS examples, and translations."
|
|||||||
(date->string date "~B ~Y")
|
(date->string date "~B ~Y")
|
||||||
version version))))))
|
version version))))))
|
||||||
|
|
||||||
(install-file #$(file-append* documentation "/htmlxref.cnf")
|
(install-file #$(file-append documentation "/htmlxref.cnf")
|
||||||
#$output)
|
#$output)
|
||||||
|
|
||||||
(for-each (lambda (texi)
|
(for-each (lambda (texi)
|
||||||
@@ -178,30 +178,27 @@ 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
|
|
||||||
(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
|
||||||
|
|||||||
+5
-1
@@ -27229,7 +27229,11 @@ This image boots the Xfce graphical environment and it contains some
|
|||||||
commonly-used tools. You can install more software in the image by running
|
commonly-used tools. You can install more software in the image by running
|
||||||
@command{guix package} in a terminal (@pxref{Invoking guix package}). You can
|
@command{guix package} in a terminal (@pxref{Invoking guix package}). You can
|
||||||
also reconfigure the system based on its initial configuration file available
|
also reconfigure the system based on its initial configuration file available
|
||||||
as @file{/etc/config.scm} (@pxref{Using the Configuration System}).
|
@c Work around the lack of /etc/config.scm in the image, as fixed on
|
||||||
|
@c 'master' with commit 9d0b9c7c6c0b0d45653dea80b499314ea415d3c7.
|
||||||
|
@uref{https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/system/examples/vm-image.tmpl?h=v1.1.0&id=d62c9b2671be55ae0305bebfda17b595f33797f2,
|
||||||
|
in the repository}
|
||||||
|
(@pxref{Using the Configuration System}).
|
||||||
|
|
||||||
Instead of using this pre-built image, one can also build their own virtual
|
Instead of using this pre-built image, one can also build their own virtual
|
||||||
machine image using @command{guix system vm-image} (@pxref{Invoking guix
|
machine image using @command{guix system vm-image} (@pxref{Invoking guix
|
||||||
|
|||||||
@@ -110,8 +110,8 @@
|
|||||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||||
;; start precisely like this.
|
;; start precisely like this.
|
||||||
(let ((version "1.1.0")
|
(let ((version "1.1.0")
|
||||||
(commit "d62c9b2671be55ae0305bebfda17b595f33797f2")
|
(commit "33ff35d57095bb1283e9fb40edc24556f9a43682")
|
||||||
(revision 0))
|
(revision 1))
|
||||||
(package
|
(package
|
||||||
(name "guix")
|
(name "guix")
|
||||||
|
|
||||||
@@ -127,7 +127,7 @@
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0v76hb0pidfgvxa22gq6hqf5yc3m527gl7hpzykazgjh881g2vmy"))
|
"049f4ycfyfahkaykdifwwisv8w3lsmkcn6hmpf0cg381ks89zwrl"))
|
||||||
(file-name (string-append "guix-" version "-checkout"))))
|
(file-name (string-append "guix-" version "-checkout"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|||||||
Reference in New Issue
Block a user