unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: texlive: Update to 2015.
@ 2015-07-19 12:55 Andreas Enge
  2015-07-22 13:57 ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2015-07-19 12:55 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 132 bytes --]

And here comes the patch to update texlive. Is it useful to mention the
modifications in the non-public source variables?

Andreas


[-- Attachment #2: 0001-gnu-texlive-Update-to-2015.patch --]
[-- Type: text/plain, Size: 3838 bytes --]

From e5959b4901fc60a4e6a3bdbaffb0d33d853a1b94 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Sun, 19 Jul 2015 14:50:51 +0200
Subject: [PATCH] gnu: texlive: Update to 2015.

* gnu/packages/texlive.scm (texlive-extra-src, texlive-texmf-src,
  texlive-texmf, texlive): Update to 2015.
  (texlive-bin): Update to 2015. Add inputs gmp and mpfr. Add configure
  flags to use system gmp and mpfr.
---
 gnu/packages/texlive.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 14ee9c3..881ed2e 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -34,6 +34,7 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -49,27 +50,27 @@
 (define texlive-extra-src
   (origin
     (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-extra.tar.xz")
+    (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150523-extra.tar.xz")
     (sha256 (base32
-              "1zlnjysvxskcy05iva6jfklirwv12wqyn3ia119a7xnqlvhpqz33"))))
+              "1dkhhacga8h1v2m9xv1w02glbdda2m8lfp1la1y1zb9yjj8jsa6i"))))
 
 (define texlive-texmf-src
   (origin
     (method url-fetch)
-    (uri "ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-texmf.tar.xz")
+    (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150523-texmf.tar.xz")
     (sha256 (base32
-              "0qsr55ms1278dhmgixs5qqwd4fxhh369ihkki6wgh8xaqm8p48p0"))))
+              "1a3hpcg6x69ysqx432v6sk4alg0x34813cwk41frmvzprdajpyqy"))))
 
 (define-public texlive-bin
   (package
    (name "texlive-bin")
-   (version "2014")
+   (version "2015")
    (source
     (origin
      (method url-fetch)
-      (uri "ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz")
+      (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150521-source.tar.xz")
       (sha256 (base32
-               "1glmaw2jv42grbsn05kay825j66scimjqqc32776bb1356q4xfq8"))))
+               "0sa6kmz4jwhv6lw702gxszhhjkvw071wba0ngk1c76g8vixwv6zd"))))
    (build-system gnu-build-system)
    (inputs
     `(("texlive-extra-src" ,texlive-extra-src)
@@ -78,6 +79,7 @@
       ("fontforge" ,fontforge)
       ("freetype" ,freetype)
       ("gd" ,gd)
+      ("gmp" ,gmp)
       ("ghostscript" ,ghostscript)
       ("graphite2" ,graphite2)
       ("harfbuzz" ,harfbuzz)
@@ -86,6 +88,7 @@
       ("libpng" ,libpng)
       ("libxaw" ,libxaw)
       ("libxt" ,libxt)
+      ("mpfr" ,mpfr)
       ("perl" ,perl)
       ("pixman" ,pixman)
       ("poppler" ,poppler)
@@ -105,12 +108,14 @@
          "--with-system-cairo"
          "--with-system-freetype2"
          "--with-system-gd"
+         "--with-system-gmp"
          "--with-system-graphite2"
          "--with-system-harfbuzz"
          "--with-system-icu"
          "--with-system-libgs"
          "--with-system-libpaper"
          "--with-system-libpng"
+         "--with-system-mpfr"
          "--with-system-pixman"
          "--with-system-poppler"
          "--with-system-potrace"
@@ -162,7 +167,7 @@ This package contains the binaries.")
 (define-public texlive-texmf
   (package
    (name "texlive-texmf")
-   (version "2014")
+   (version "2015")
    (source texlive-texmf-src)
    (build-system gnu-build-system)
    (inputs
@@ -218,7 +223,7 @@ This package contains the complete tree of texmf-dist data.")
 (define-public texlive
   (package
    (name "texlive")
-   (version "2014")
+   (version "2015")
    (source #f)
    (build-system trivial-build-system)
    (inputs `(("bash" ,bash) ; for wrap-program
-- 
2.4.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] gnu: texlive: Update to 2015.
  2015-07-19 12:55 [PATCH] gnu: texlive: Update to 2015 Andreas Enge
@ 2015-07-22 13:57 ` Ludovic Courtès
  2015-07-22 17:27   ` Andreas Enge
  0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2015-07-22 13:57 UTC (permalink / raw)
  To: Andreas Enge; +Cc: guix-devel

Andreas Enge <andreas@enge.fr> skribis:

> And here comes the patch to update texlive. Is it useful to mention the
> modifications in the non-public source variables?

Yes, all the modified variables must be mentioned in the log.

> From e5959b4901fc60a4e6a3bdbaffb0d33d853a1b94 Mon Sep 17 00:00:00 2001
> From: Andreas Enge <andreas@enge.fr>
> Date: Sun, 19 Jul 2015 14:50:51 +0200
> Subject: [PATCH] gnu: texlive: Update to 2015.
>
> * gnu/packages/texlive.scm (texlive-extra-src, texlive-texmf-src,
>   texlive-texmf, texlive): Update to 2015.
>   (texlive-bin): Update to 2015. Add inputs gmp and mpfr. Add configure
>   flags to use system gmp and mpfr.

LGTM, thanks!

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] gnu: texlive: Update to 2015.
  2015-07-22 13:57 ` Ludovic Courtès
@ 2015-07-22 17:27   ` Andreas Enge
  2015-07-22 22:11     ` Mark H Weaver
  0 siblings, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2015-07-22 17:27 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

On Wed, Jul 22, 2015 at 03:57:01PM +0200, Ludovic Courtès wrote:
> Yes, all the modified variables must be mentioned in the log.

Thanks for the confirmation!

> LGTM, thanks!

Actually, it looks good, but does not work, I forgot to test the package...
When running "pdflatex something.tex", there is an error message
kpathsea: Running mktexfmt pdflatex.fmt
Can't locate TeXLive/TLUtils.pm in @INC (@INC contains: /gnu/store/n5i1m8hh6bj59hkhdgkahd4sp7bmzpah-texlive-texmf-2015/share/tlpkg /gnu/store/n5i1m8hh6bj59hkhdgkahd4sp7bmzpah-texlive-texmf-2015/share/texmf-dist/scripts/texlive /home/privat/.guix-profile/lib/perl5/site_perl/5.16.1/x86_64-linux /home/privat/.guix-profile/lib/perl5/site_perl/5.16.1 /home/privat/.guix-profile/lib/perl5/site_perl /gnu/store/s0xvxmh13kfsqw5g4w6ar4dh74inff2g-perl-5.16.1/lib/perl5/site_perl/5.16.1/x86_64-linux /gnu/store/s0xvxmh13kfsqw5g4w6ar4dh74inff2g-perl-5.16.1/lib/perl5/site_perl/5.16.1 /gnu/store/s0xvxmh13kfsqw5g4w6ar4dh74inff2g-perl-5.16.1/lib/perl5/5.16.1/x86_64-linux /gnu/store/s0xvxmh13kfsqw5g4w6ar4dh74inff2g-perl-5.16.1/lib/perl5/5.16.1 .) at /gnu/store/5l3gds2ijrwgnzdm36bya5k075l52ffc-texlive-bin-2015/
 share/texmf-dist/scripts/texlive/fmtutil.pl line 49.
BEGIN failed--compilation aborted at /gnu/store/5l3gds2ijrwgnzdm36bya5k075l52ffc-texlive-bin-2015/share/texmf-dist/scripts/texlive/fmtutil.pl line 49.
I can't find the format file `pdflatex.fmt'!

This should normally have been handled by the call to "fmtutil-sys" in
texlive-texmf. I will investigate.

Andreas

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] gnu: texlive: Update to 2015.
  2015-07-22 17:27   ` Andreas Enge
@ 2015-07-22 22:11     ` Mark H Weaver
  2015-07-23 23:22       ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2015-07-22 22:11 UTC (permalink / raw)
  To: Andreas Enge; +Cc: guix-devel

Andreas Enge <andreas@enge.fr> writes:

> On Wed, Jul 22, 2015 at 03:57:01PM +0200, Ludovic Courtès wrote:
>> Yes, all the modified variables must be mentioned in the log.
>
> Thanks for the confirmation!
>
>> LGTM, thanks!
>
> Actually, it looks good, but does not work, I forgot to test the package...
> When running "pdflatex something.tex", there is an error message

Ah, good catch!

I see that you still pushed a 'teckit' update.  It probably would have
been better to push that together with the 'texlive' update, whenever
that happens.  At a time when new users are trying out the 0.8.3
release, the teckit update forced over 200 rebuilds starting with
texlive-2014, which will soon be upgraded.  Rebuilding texlive-texmf
alone costs the build farm about 4-5 build-slot-days.

     Mark

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] gnu: texlive: Update to 2015.
  2015-07-22 22:11     ` Mark H Weaver
@ 2015-07-23 23:22       ` Ludovic Courtès
  2015-07-24 20:54         ` Mark H Weaver
  0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2015-07-23 23:22 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: guix-devel

Mark H Weaver <mhw@netris.org> skribis:

> I see that you still pushed a 'teckit' update.  It probably would have
> been better to push that together with the 'texlive' update, whenever
> that happens.  At a time when new users are trying out the 0.8.3
> release, the teckit update forced over 200 rebuilds starting with
> texlive-2014, which will soon be upgraded.  Rebuilding texlive-texmf
> alone costs the build farm about 4-5 build-slot-days.

I agree that it would have been better to group the two updates
together.

Now, fortunately the build farm is relatively idle currently, so the
impact has been low, I think.

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] gnu: texlive: Update to 2015.
  2015-07-23 23:22       ` Ludovic Courtès
@ 2015-07-24 20:54         ` Mark H Weaver
  0 siblings, 0 replies; 6+ messages in thread
From: Mark H Weaver @ 2015-07-24 20:54 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

ludo@gnu.org (Ludovic Courtès) writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> I see that you still pushed a 'teckit' update.  It probably would have
>> been better to push that together with the 'texlive' update, whenever
>> that happens.  At a time when new users are trying out the 0.8.3
>> release, the teckit update forced over 200 rebuilds starting with
>> texlive-2014, which will soon be upgraded.  Rebuilding texlive-texmf
>> alone costs the build farm about 4-5 build-slot-days.
>
> I agree that it would have been better to group the two updates
> together.
>
> Now, fortunately the build farm is relatively idle currently, so the
> impact has been low, I think.

You're right, the impact was much less than I feared.
Sorry for the noise.

     Mark

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-07-24 20:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-19 12:55 [PATCH] gnu: texlive: Update to 2015 Andreas Enge
2015-07-22 13:57 ` Ludovic Courtès
2015-07-22 17:27   ` Andreas Enge
2015-07-22 22:11     ` Mark H Weaver
2015-07-23 23:22       ` Ludovic Courtès
2015-07-24 20:54         ` Mark H Weaver

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).