doc: Remove one use of 'file-append*'.

* doc/build.scm (texinfo-manual-source)[build]: Use 'file-append', not 'file-append*', for 'htmlxref.cnf', to ensure it has the right basename.
doc: Inherit md5.scm fix in custom 'guile-lib' variant.
2026-04-28 06:34:05 +00:00 · 2020-08-26 22:59:39 +02:00 · 2020-06-29 21:22:39 +02:00 · 2020-04-20 12:18:28 +02:00 · 2020-04-15 10:17:49 +02:00
3 changed files with 26 additions and 25 deletions
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -137,7 +137,7 @@ as well as images, OS examples, and translations."
                            (date->string date "~B ~Y")
                            version version))))))

-          (install-file #$(file-append* documentation "/htmlxref.cnf")
+          (install-file #$(file-append documentation "/htmlxref.cnf")
                        #$output)

          (for-each (lambda (texi)
@@ -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
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
@command{guix package} in a terminal (@pxref{Invoking guix package}).  You can
 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
 machine image using @command{guix system vm-image} (@pxref{Invoking guix
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -110,8 +110,8 @@
  ;; Note: the 'update-guix-package.scm' script expects this definition to
  ;; start precisely like this.
  (let ((version "1.1.0")
-        (commit "d62c9b2671be55ae0305bebfda17b595f33797f2")
-        (revision 0))
+        (commit "33ff35d57095bb1283e9fb40edc24556f9a43682")
+        (revision 1))
    (package
      (name "guix")

@@ -127,7 +127,7 @@
                      (commit commit)))
                (sha256
                 (base32
-                  "0v76hb0pidfgvxa22gq6hqf5yc3m527gl7hpzykazgjh881g2vmy"))
+                  "049f4ycfyfahkaykdifwwisv8w3lsmkcn6hmpf0cg381ks89zwrl"))
                (file-name (string-append "guix-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
Author	SHA1	Message	Date
Ludovic Courtès	0c7c84407d	doc: Remove one use of 'file-append'. doc/build.scm (texinfo-manual-source)[build]: Use 'file-append', not 'file-append*', for 'htmlxref.cnf', to ensure it has the right basename.	2020-08-26 22:59:39 +02:00
Ludovic Courtès	3601d8112c	doc: Inherit md5.scm fix in custom 'guile-lib' variant. * doc/build.scm (guile-lib/htmlprag-fixed)[source]: Remove. [arguments]: Add 'fix-htmlprag' phase.	2020-06-29 21:22:39 +02:00
Ludovic Courtès	f25e71e89f	doc: Work around lack of /etc/config.scm in the VM image. * doc/guix.texi (Running Guix in a VM): Replace reference to /etc/config.scm with a link to the repo.	2020-04-20 12:18:28 +02:00
Ludovic Courtès	442fa22d9e	gnu: guix: Update to `33ff35d`.	2020-04-15 10:17:49 +02:00