ngz pushed a commit to branch tex-team
in repository guix.
commit 0b5562d5d53779096163c6230da527bb774f6481
Author: Ludovic Courtès <[email protected]>
AuthorDate: Fri Apr 7 16:07:23 2023 +0200
svn-download: Disable keyword expansion.
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.
Reported by Timothy Sample <[email protected]>.
* guix/build/svn.scm (svn-fetch): Pass '--ignore-keywords'.
* gnu/packages/java.scm (java-geronimo-xbean-reflect):
* gnu/packages/machine-learning.scm (ghmm): Adjust source hash
accordingly.
* gnu/packages/tex.scm (texlive-hyphen-base): Likewise.
(texlive-dvips): Likewise.
(texlive-cm): Likewise.
(texlive-tex-plain): Likewise.
(texlive-kpathsea): Likewise
(texlive-latexconfig): Likewise.
(texlive-tetex): Likewise.
(texlive-pdftex): Likewise.
* gnu/packages/video.scm (libsmpeg): Likewise.
(libsmpeg-with-sdl1): Likewise.
Signed-off-by: Nicolas Goaziou <[email protected]>
---
gnu/packages/java.scm | 2 +-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/tex.scm | 16 ++++++++--------
gnu/packages/video.scm | 4 ++--
guix/build/svn.scm | 9 ++++++++-
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 067284017c..375f62a3b0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11240,7 +11240,7 @@ outputting XML data from Java code.")
(file-name (string-append name "-" version))
(sha256
(base32
- "18q3i6jgm6rkw8aysfgihgywrdc5nvijrwnslmi3ww497jvri6ja"))))
+ "0zjqmsad4xk0iar23hdyvx19nxczybd2bh0i35xrafli5cmh720k"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "geronimo-xbean-reflect.jar"
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 8c912cf2da..79525c92b4 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -235,7 +235,7 @@ classification.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0qbq1rqp94l530f043qzp8aw5lj7dng9wq0miffd7spd1ff638wq"))))
+ "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z"))))
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3429858306..c00906a5c8 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -784,7 +784,7 @@ out to date by @code{unicode-letters.tex}.")
"/tex/generic/hyphen/hypht1.tex"
"/tex/generic/hyphen/zerohyph.tex")
(base32
- "1sagn9aybs34m1s6m3zwya5g5kbiwfnw8ifcgxssygmzzs88dgjp")
+ "1nad1bqpjsywm49hlv7d75mqvgha3j5vayvkvfhv8wwzgdb3mk84")
#:trivial? #t))
(home-page "https://tug.org/texlive/";)
(synopsis "Core hyphenation support files")
@@ -836,7 +836,7 @@ features as does pdfTeX.")
"/fonts/enc/dvips/base/"
"/tex/generic/dvips/")
(base32
- "0rns1hpjy4fmsskmkwx197j8qbgdmyj0j9214sq9vhpa6nv7czm3")
+ "1fb73mfw9mp4ylp6sfc0465rbdb7k830aq0qf3c085c3n0zyrin8")
#:trivial? #t))
(home-page "https://www.ctan.org/pkg/dvips";)
(synopsis "DVI to PostScript drivers")
@@ -1094,7 +1094,7 @@ cite bundle of the author's citation-related packages.")
"/fonts/map/dvips/cm/cmtext-bsr-interpolated.map"
"/doc/fonts/cm/")
(base32
- "1ky4gvcn8qn3d61bvb39512b8r92igv6il7vh02hw04223yj6q8i")
+ "0mfslqs9saqkb3z3xdhsqnklxk858nmipgj1y93by2791jzkma1d")
#:trivial? #t)))
(package
(inherit template)
@@ -1698,7 +1698,7 @@ incorporates the e-TeX extensions.")
"texlive-tex-plain"
(list "/tex/plain/")
(base32
- "0gwygkm8i2jmpf7bfg6fb6824rl7fq4a2s0wni73v0fz6s4chr1n")
+ "1hafbphx1486069cky87hyksx6ia5gd83m4wp2xmgc09z87faf0h")
#:trivial? #t))
(home-page "https://www.ctan.org/pkg/plain";)
(synopsis "Plain TeX format and supporting files")
@@ -2904,7 +2904,7 @@ package.")
"/web2c/tcvn-t5.tcx"
"/web2c/viscii-t5.tcx")
(base32
- "00q2nny7lw7jxyln6ch4h0alygbrzk8yynliyc291m53kds1h0mr")
+ "08nfk5hicqbvnz73rjbxi97lcakd9i1k2cy4qi2cwghan92650jq")
#:trivial? #t)))
(package
(inherit template)
@@ -2967,7 +2967,7 @@ default and narrow versions of multiple integrals.")
"texlive-latexconfig"
(list "/tex/latex/latexconfig/")
(base32
- "10ynmd8b9b9l1wl1mva23yz4zir53p6r5z31s39wmxz19pj12qvx")
+ "1x5fyr2185nx3qlyariykdz44hcy5azimrk9db2p707dg08bjhsd")
#:trivial? #t))
(home-page "https://www.tug.org/";)
(synopsis "Configuration files for LaTeX-related formats")
@@ -4019,7 +4019,7 @@ of file names.")
"/fonts/enc/dvips/tetex/"
"/fonts/map/dvips/tetex/")
(base32
- "1si3as8mwi8837965djlw6jhwwzsp3r1hkflvdxv2avx9vb45hjb")
+ "05mf8yqdj2wrc1zm3al2j4aam2wx0ky6a7slxw17pkd1c7rmvjrq")
#:trivial? #t))
(home-page "https://www.ctan.org/pkg/tetex";)
(synopsis "Font maps originally from teTeX")
@@ -8689,7 +8689,7 @@ e-TeX.")
"/tex/generic/pdftex/glyphtounicode.tex"
"/tex/generic/pdftex/pdfcolor.tex")
(base32
- "1wx928rqsv0x1a8vc7aq49w3nglr4bmlhl822slqglymfxrmb91b")
+ "0w4ar5g7x4w8zw8z6hdwqxwcbglfzzq7pcznz8rawllwy6dssr8g")
#:trivial? #t))
;; TODO: add this missing package:
;; dehyph
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1e9c04c5e5..e824dfdef1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3775,7 +3775,7 @@ Other features include a live preview and live
streaming.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "18yfkr70lr1x1hc8snn2ldnbzdcc7b64xmkqrfk8w59gpg7sl1xn"))))
+ "1srzyjks9s0g4k7ms8vc0hjby2g6shndnr552hl63pn90sgmwxs9"))))
(build-system gnu-build-system)
(arguments
;; libsmpeg fails to build with -std=c++11, which is the default with
@@ -3811,7 +3811,7 @@ and MPEG system streams.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0jfi085rf3fa5xsn0vd3nqf32my8ph9c6a9445y7a8lrlz4dms64"))))
+ "1jy9xqykhwfg8in0fxjcqcvwazii1ckzs39wp749b926q7ny5bwy"))))
(inputs
(list sdl))))
diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 2d960cb364..875d3c50ca 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2020 Ludovic Courtès <[email protected]>
+;;; Copyright © 2014, 2020, 2023 Ludovic Courtès <[email protected]>
;;; Copyright © 2014 Sree Harsha Totakura <[email protected]>
;;; Copyright © 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2020 Simon Tournier <[email protected]>
@@ -47,6 +47,13 @@ valid Subversion revision. Return #t on success, #f
otherwise."
;; verify the checksum later. This can be removed when
;; ca-certificates package is added.
"--trust-server-cert" "-r" (number->string revision)
+
+ ;; Disable keyword substitutions (keywords are CVS-like strings
+ ;; like "$Date$", "$Id$", and so on) for two reasons: (1) some
+ ;; expansions depend on the local time zone, and (2) SWH disables
+ ;; it in its archive for this very reason.
+ "--ignore-keywords"
+
`(,@(if (and user-name password)
(list (string-append "--username=" user-name)
(string-append "--password=" password))
