diff mbox series

[bug#36513] texlive-union: Build missing font maps.

Message ID 87d0ioschd.fsf@elephly.net
State Accepted
Headers show
Series [bug#36513] texlive-union: Build missing font maps. | expand

Commit Message

Ricardo Wurmus July 5, 2019, 3:54 p.m. UTC 
Hi Guix,

this patch causes texlive-union to include pdftex.map, among other font
map files.  This is achieved by running updmap in the builder.

This should fix a couple of problems.

Unfortunately, this doesn’t fix the same problem with the profile hook,
so I think this means that the profile hook should be using
texlive-union to avoid duplication.

What do you think?

--
Ricardo

Comments

Ludovic Courtès July 15, 2019, 8:31 p.m. UTC | #1 
Hello,

Ricardo Wurmus <rekado@elephly.net> skribis:

>>From 11900d109a617d07e0085a25e747da76fcb12c2e Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Fri, 5 Jul 2019 17:48:45 +0200
> Subject: [PATCH] gnu: texlive-union: Build font maps.
>
> * gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to generate
> missing font maps.
> [native-inputs]: Add coreutils, sed, and updmap.cfg.

I’m blissfully ignorant about TeX’s font maps, but I can say that this
fixes a warning about missing font maps that I had when using a
‘texlive-union’ as a package input.

Now, that probably leads to a big rebuild.  Can we estimate the number
of dependents?

Thank you!

Ludo’.
Ricardo Wurmus July 15, 2019, 8:47 p.m. UTC | #2 
Hi Ludo,

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>>>From 11900d109a617d07e0085a25e747da76fcb12c2e Mon Sep 17 00:00:00 2001
>> From: Ricardo Wurmus <rekado@elephly.net>
>> Date: Fri, 5 Jul 2019 17:48:45 +0200
>> Subject: [PATCH] gnu: texlive-union: Build font maps.
>>
>> * gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to generate
>> missing font maps.
>> [native-inputs]: Add coreutils, sed, and updmap.cfg.
>
> I’m blissfully ignorant about TeX’s font maps, but I can say that this
> fixes a warning about missing font maps that I had when using a
> ‘texlive-union’ as a package input.
>
> Now, that probably leads to a big rebuild.  Can we estimate the number
> of dependents?

In addition to this change I just pushed to wip-texlive a number of
changes that may lead to an even bigger number of rebuilds due to
changes in the svn fetcher and even more TeX packages.

(I noticed that the branch name “wip-texlive” was already taken by the
attempt to add a new importer, so I just cherry-picked that commit and
replaced the branch.)

I don’t know yet if it leads to practical improvements for users, but at
least it greatly simplifies the definition of texlive-* packages.

I have yet to double check the often unclear licenses of the
texlive-hyphen-* packages.  Other than that and the WIP commit by Pierre
at the tip I think these changes are very close to their final form.

--
Ricardo
Ludovic Courtès July 19, 2019, 12:04 p.m. UTC | #3 
Hello,

Ricardo Wurmus <rekado@elephly.net> skribis:

> In addition to this change I just pushed to wip-texlive a number of
> changes that may lead to an even bigger number of rebuilds due to
> changes in the svn fetcher and even more TeX packages.
>
> (I noticed that the branch name “wip-texlive” was already taken by the
> attempt to add a new importer, so I just cherry-picked that commit and
> replaced the branch.)
>
> I don’t know yet if it leads to practical improvements for users, but at
> least it greatly simplifies the definition of texlive-* packages.
>
> I have yet to double check the often unclear licenses of the
> texlive-hyphen-* packages.  Other than that and the WIP commit by Pierre
> at the tip I think these changes are very close to their final form.

Yay, very nice!

When it’s ready, we can ask berlin to build it as a separate branch and
merge it once it’s done.

Thanks a lot!

Ludo’.
Ricardo Wurmus July 22, 2019, 7:28 p.m. UTC | #4 
Hi,

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> In addition to this change I just pushed to wip-texlive a number of
>> changes that may lead to an even bigger number of rebuilds due to
>> changes in the svn fetcher and even more TeX packages.
>>
>> (I noticed that the branch name “wip-texlive” was already taken by the
>> attempt to add a new importer, so I just cherry-picked that commit and
>> replaced the branch.)
>>
>> I don’t know yet if it leads to practical improvements for users, but at
>> least it greatly simplifies the definition of texlive-* packages.
>>
>> I have yet to double check the often unclear licenses of the
>> texlive-hyphen-* packages.  Other than that and the WIP commit by Pierre
>> at the tip I think these changes are very close to their final form.
>
> Yay, very nice!
>
> When it’s ready, we can ask berlin to build it as a separate branch and
> merge it once it’s done.

The “wip-texlive” branch is now being built on Berlin.

(I removed the WIP importer from “wip-texlive” and pushed it to a new
“wip-texlive-importer” branch instead.)

--
Ricardo
Pierre Neidhardt July 22, 2019, 8:19 p.m. UTC | #5 
Thanks for making progress on this! :)

Out of curiosity, why bother renaming the branches and not simply choose
a different name, e.g. wip-texlive-union?  Is there something special with
the "wip-texlive" name?
Ricardo Wurmus July 22, 2019, 9:27 p.m. UTC | #6 
Pierre Neidhardt <mail@ambrevar.xyz> writes:

> Thanks for making progress on this! :)
>
> Out of curiosity, why bother renaming the branches and not simply choose
> a different name, e.g. wip-texlive-union?  Is there something special with
> the "wip-texlive" name?

No.  It’s just the name I picked.

At first I thought I could include the importer but then noticed that it
isn’t close enough to finished, so I moved it out again.  Had I known
this earlier I would have picked a different branch for my work in the
first place.
Ludovic Courtès Sept. 4, 2019, 1:37 p.m. UTC | #7 
Hey!

Ricardo Wurmus <rekado@elephly.net> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>
>>> In addition to this change I just pushed to wip-texlive a number of
>>> changes that may lead to an even bigger number of rebuilds due to
>>> changes in the svn fetcher and even more TeX packages.

[...]

> The “wip-texlive” branch is now being built on Berlin.

We’ll probably need to rebase it now, but otherwise it seemed to be in
good shape: <https://berlin.guixsd.org/jobset/wip-texlive>.

Thoughts?

Ludo’.
Ricardo Wurmus Sept. 4, 2019, 2:17 p.m. UTC | #8 
Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>
>>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>>
>>>> In addition to this change I just pushed to wip-texlive a number of
>>>> changes that may lead to an even bigger number of rebuilds due to
>>>> changes in the svn fetcher and even more TeX packages.
>
> [...]
>
>> The “wip-texlive” branch is now being built on Berlin.
>
> We’ll probably need to rebase it now, but otherwise it seemed to be in
> good shape: <https://berlin.guixsd.org/jobset/wip-texlive>.

It has already been merged some time ago.  I did however notice a couple
more problems with our TeX Live packages that will require some deep
rebuilds again.

I’m very close to fixing these problems, but I’m currently stuck with a
confusing search path issue that I have yet to fully understand.  Once
that’s done I’ll push my work to wip-texlive and have Berlin build it
again.

My fixes should finally solve the font problems.  (I’m using my WIP
package for “guile-cv” as a test case, which currently cannot be built
as it fails to find certain fonts.)

--
Ricardo
Pierre Neidhardt Sept. 4, 2019, 2:51 p.m. UTC | #9 
Ricardo Wurmus <rekado@elephly.net> writes:

> My fixes should finally solve the font problems.  (I’m using my WIP
> package for “guile-cv” as a test case, which currently cannot be built
> as it fails to find certain fonts.)

Is this font problem related to LaTeX's "tabular" not working?

(And sorry for not helping much on this, I'd love to but really no time
at the moment.)
Ricardo Wurmus Sept. 4, 2019, 4:07 p.m. UTC | #10 
Pierre Neidhardt <mail@ambrevar.xyz> writes:

> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> My fixes should finally solve the font problems.  (I’m using my WIP
>> package for “guile-cv” as a test case, which currently cannot be built
>> as it fails to find certain fonts.)
>
> Is this font problem related to LaTeX's "tabular" not working?

I haven’t even looked at “tabular”, but broken font maps can lead to all
sorts of problems.  I had made a rather silly mistake in running updmap,
which had no effect at all on the list of enabled font maps.

Another problem is that certain files are missing from one of the
packages.  (This was reported on IRC shortly after merging wip-texlive.)

--
Ricardo
Ludovic Courtès Sept. 5, 2019, 8:35 a.m. UTC | #11 
Moin!

Ricardo Wurmus <rekado@elephly.net> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>
>>> Ludovic Courtès <ludo@gnu.org> writes:
>>>
>>>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>>>
>>>>> In addition to this change I just pushed to wip-texlive a number of
>>>>> changes that may lead to an even bigger number of rebuilds due to
>>>>> changes in the svn fetcher and even more TeX packages.
>>
>> [...]
>>
>>> The “wip-texlive” branch is now being built on Berlin.
>>
>> We’ll probably need to rebase it now, but otherwise it seemed to be in
>> good shape: <https://berlin.guixsd.org/jobset/wip-texlive>.
>
> It has already been merged some time ago.  I did however notice a couple
> more problems with our TeX Live packages that will require some deep
> rebuilds again.
>
> I’m very close to fixing these problems, but I’m currently stuck with a
> confusing search path issue that I have yet to fully understand.  Once
> that’s done I’ll push my work to wip-texlive and have Berlin build it
> again.

Ah OK, sounds good.

> My fixes should finally solve the font problems.  (I’m using my WIP
> package for “guile-cv” as a test case, which currently cannot be built
> as it fails to find certain fonts.)

Cool, thanks for explaining!

Ludo’.
Ricardo Wurmus Oct. 17, 2020, 10:07 a.m. UTC | #12 
The wip-texlive branch has already been merged.  Closing!
diff mbox series

Patch

From 11900d109a617d07e0085a25e747da76fcb12c2e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 5 Jul 2019 17:48:45 +0200
Subject: [PATCH] gnu: texlive-union: Build font maps.

* gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to generate
missing font maps.
[native-inputs]: Add coreutils, sed, and updmap.cfg.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ec35315f22..85c72e006a 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2387,16 +2387,18 @@  standard LaTeX packages."
            #:builder
            (begin
              (use-modules (ice-9 match)
+                          (ice-9 popen)
                           (srfi srfi-26)
                           (guix build union)
                           (guix build utils)
                           (guix build texlive-build-system))
              (let* ((out       (assoc-ref %outputs "out"))
                     (texmf.cnf (string-append out "/share/texmf-dist/web2c/texmf.cnf")))
-               ;; Build a modifiable union of all inputs (but exclude bash)
+               ;; Build a modifiable union of all inputs (but exclude bash and
+               ;; the updmap.cfg file)
                (match (filter (match-lambda
                                 ((name . _)
-                                 (not (string=? "bash" name))))
+                                 (not (member name '("bash" "updmap.cfg")))))
                               %build-inputs)
                  (((names . directories) ...)
                   (union-build (assoc-ref %outputs "out")
@@ -2413,19 +2415,47 @@  standard LaTeX packages."
                   (string-append "TEXMFROOT = " out "/share\n"))
                  (("^TEXMF = .*")
                   "TEXMF = $TEXMFROOT/share/texmf-dist\n"))
-               (setenv "PATH" (string-append (assoc-ref %build-inputs "bash")
-                                             "/bin"))
+               (setenv "PATH" (string-append
+                               (assoc-ref %build-inputs "bash") "/bin:"
+                               (assoc-ref %build-inputs "coreutils") "/bin:"
+                               (string-append out "/bin")))
                (for-each
                 (cut wrap-program <>
                      `("TEXMFCNF" ":" suffix (,(dirname texmf.cnf)))
                      `("TEXMF"    ":" suffix (,(string-append out "/share/texmf-dist"))))
                 (find-files (string-append out "/bin") ".*"))
+
+               ;; Remove invalid maps from config file.
+               (let ((port (open-pipe* OPEN_WRITE "updmap-sys"
+                                       "--syncwithtrees"
+                                       "--nohash"
+                                       (assoc-ref %build-inputs "updmap.cfg"))))
+                 (display "Y\n" port)
+                 (when (not (zero? (status:exit-val (close-pipe port))))
+                   (error "failed to filter updmap.cfg")))
+               ;; Generate maps.
+               (invoke "updmap-sys" "--force"
+                       (string-append out "/share/texmf-config/web2c/updmap.cfg"))
                #t))))
         (inputs
          `(("bash" ,bash)
            ,@(map (lambda (package)
                     (list (package-name package) package))
                   (append default-packages packages))))
+        (native-inputs
+         `(("coreutils" ,coreutils)
+           ("sed" ,sed)
+           ("updmap.cfg"
+            ,(origin
+               (method url-fetch)
+               (uri (string-append "https://tug.org/svn/texlive/tags/"
+                                   %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg"
+                                   "?revision=" (number->string %texlive-revision)))
+               (file-name (string-append "updmap.cfg-"
+                                         (number->string %texlive-revision)))
+               (sha256
+                (base32
+                 "06mwpy5i218g5k3sf4gba0fmxgas82hkzx9fhwn67z5ik37d8apq"))))))
         (home-page (package-home-page texlive-bin))
         (synopsis "Union of TeX Live packages")
         (description "This package provides a subset of the TeX Live
-- 
2.21.0