branch tex-team updated: svn-download: Do not expand keywords.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch tex-team
in repository guix.

The following commit(s) were added to refs/heads/tex-team by this push:
     new 7686e2e049 svn-download: Do not expand keywords.
7686e2e049 is described below

commit 7686e2e04966bc2dafedc12922f803a4781ed89b
Author: Timothy Sample <samplet@ngyro.com>
AuthorDate: Wed Apr 5 13:46:28 2023 -0600

    svn-download: Do not expand keywords.
    
    Subversion keyword expansion is potentially non-reproducible as some of
    them expand time strings relative to the local time zone:
    
      https://issues.guix.gnu.org/43442#18
    
    In practice this is not a problem in Guix since Subversion checkouts
    happen in an isolated environment using the "default timezone" (UTC).
    
    However, Software Heritage disables keyword expansion for this very
    reason.  By following suit, we make sure content can be retrieved from
    there.
    
    * guix/build/svn.scm (svn-fecth): Pass "--ignore-keywords" to
    Subversion.
    * guix/build-system/texlive.scm (%texlive-date): New variable.
    * gnu/packages/java.scm (java-geronimo-xbean-reflect)
    (java-geronimo-genesis-2.1): Update the source hash.
    * gnu/packages/machine-learning.scm (ghmm): Likewise.
    * gnu/packages/video.scm (libsmpeg, libsmpeg-with-sdl1): Likewise.
    * gnu/packages/tex.scm (texlive-bin): Update the hash of the
    "texlive-scripts" input, and a add a new phase that imitates
    Subversion keyword expansion for scripts that need it.
    (texlive-latex-base): Update the hash of the "texlive-luatexconfig"
    native input.
    (texlive-hyphen-base, texlive-dvipdfmx, texlive-dvips, texlive-cm)
    (texlive-tex-plain, texlive-kpathsea, texlive-latexconfig)
    (texlive-tetex, texlive-pdftex, texlive-xetex): Update the source
    hash.
    
    Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/java.scm         |  2 +-
 gnu/packages/tex.scm          | 36 +++++++++++++++++++++++++++++++-----
 guix/build-system/texlive.scm |  4 +++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 375f62a3b0..49f027b226 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11291,7 +11291,7 @@ and graphs of objects for dependency injection 
frameworks")
               (file-name (string-append name "-" version "-source"))
               (sha256
                (base32
-                "119yn795jvnjf52si84q192s8wag1k013iabg78b7wnadssnnh31"))))
+                "1mky4zyl2xsqlgrkairaj5971byvhwk2z9bq8snsgvlr11ydc0zf"))))
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index c00906a5c8..6625306648 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -27,6 +27,7 @@
 ;;; Copyright © 2023 Thomas Albers Raviola <thomas@thomaslabs.org>
 ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
+;;; Copyright © 2023 Timothy Sample <samplet@ngyro.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -295,7 +296,7 @@ files from LOCATIONS with expected checksum HASH.  CODE is 
not currently in use.
                                      "-checkout"))
            (sha256
             (base32
-             "10xpa4nnz1biap7qfv7fb0zk6132ki5g1j8w0bqwkggfncdfl07d"))))
+             "1jrphfjhmw17rp1yqsl70shmvka3vg0g8841q6zx2lfn48p7vqf3"))))
        ("cairo" ,cairo)
        ("fontconfig" ,fontconfig)
        ("fontforge" ,fontforge)
@@ -423,7 +424,32 @@ files from LOCATIONS with expected checksum HASH.  CODE is 
not currently in use.
              (mkdir "texlive-scripts")
              (with-directory-excursion "texlive-scripts"
                (apply (assoc-ref %standard-phases 'unpack)
-                      (list #:source (assoc-ref inputs "texlive-scripts"))))))
+                      (list #:source (assoc-ref inputs "texlive-scripts")))
+               ;; Configure the version string for some scripts.
+               ;; Normally this would be done by Subversion.
+               ;; See <https://issues.guix.gnu.org/43442#15>.
+               (for-each (lambda (file)
+                           (substitute* file
+                             (("\\$Id\\$")
+                              (format #f "$Id: ~a ~a ~a nobody $"
+                                      file
+                                      ,%texlive-revision
+                                      ,%texlive-date))
+                             (("\\$Revision\\$")
+                              (format #f "$Revision: ~a $"
+                                      ,%texlive-revision))
+                             (("\\$Date\\$")
+                              (format #f "$Date: ~a $"
+                                      ,%texlive-date))))
+                         '("fmtutil.pl"
+                           "mktexlsr"
+                           "mktexlsr.pl"
+                           "mktexmf"
+                           "mktexpk"
+                           "mktextfm"
+                           "tlmgr.pl"
+                           "tlmgrgui.pl"
+                           "updmap.pl")))))
          (add-after 'unpack-texlive-scripts 'patch-scripts
            (lambda _
              (let* ((scripts (append (find-files "texk/kpathsea" "^mktex")
@@ -804,7 +830,7 @@ default versions of those), etc.")
                          "fonts/cmap/dvipdfmx/"
                          "fonts/map/dvipdfmx/")
                    (base32
-                    "04x93w777l9qzdzglwanb14k8cmq74kjcsgyanvp3bsmnn5zfrgz")
+                    "08i81hciksh0sm9pw6lw8v8s2rj92p58wd5j2mq1mzqbp171wjmr")
                    #:trivial? #t)))
     (package
       (inherit template)
@@ -3121,7 +3147,7 @@ formats.")
                   "/tex/generic/config/luatexiniconfig.tex"
                   "/web2c/texmfcnf.lua")
             (base32
-             "0yjx7nw9mgfgnq1givkzbxh7z7ncw1liaddjgm7n2nwn0aw6xfdg")))))
+             "065j47i2785nbj2507pzxlscyrwr4ghv6nksc3a01rp62bq8kkjp")))))
       (propagated-inputs
        (list texlive-dehyph-exptl
              texlive-etex
@@ -13544,7 +13570,7 @@ itself may be shipped out to the DVI file.")
                     "/fonts/misc/xetex/fontmapping/base/"
                     "/tex/xelatex/xetexconfig/")
               (base32
-               "1gmgagvsv2qknrjzjk840ca3wging8wfc20rgq7bnhphm9n87m6q")
+               "0j396anlhk5pqrnwxr8bpq55sp3qfyb6n9g08x4nmaa6p9b9y8ab")
               #:trivial? #t))
     (propagated-inputs
      (list texlive-atbegshi
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index d970c1beb9..aefd573d11 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -34,7 +34,8 @@
             texlive-ref
             texlive-origin
             %texlive-tag
-            %texlive-revision))
+            %texlive-revision
+            %texlive-date))
 
 ;; Commentary:
 ;;
@@ -46,6 +47,7 @@
 ;; are taken from https://www.tug.org/svn/texlive/tags/
 (define %texlive-tag "texlive-2021.3")
 (define %texlive-revision 59745)
+(define %texlive-date "2021-06-28 21:59:21Z")
 
 (define (texlive-origin name version locations hash)
   "Return an <origin> object for a TeX Live package consisting of multiple