On Sat, Aug 05, 2017 at 03:26:07PM -0400, Leo Famulari wrote: > On Mon, Jul 31, 2017 at 09:26:56AM +0200, Ricardo Wurmus wrote: > > If we upgrade those two, I’m pretty sure we won’t need Biber 2.5 any > > more and can replace it with what is currently biber-next. > > > > I would suggest not to spend too much time on Biber 2.5 as it is on its > > way out — it just needs a texlive-texmf update. > > Okay, I'm working on this today.
The attached patches update texlive to 2017 and remove biber-2.5. Ricardo, can you check if biber@2.7 works with these patches?
From f7f1a75bd27014a97024f5b44b87861a2123de35 Mon Sep 17 00:00:00 2001 From: Leo Famulari <l...@famulari.name> Date: Sat, 5 Aug 2017 17:56:49 -0400 Subject: [PATCH 1/2] gnu: texlive: Update to 2017. * gnu/packages/tex.scm (texlive, texlive-texmf): Update to 2017. (texlive-texmf-src): Update to 20170524. Remove 'texlive-texmf-CVE-2016-10243.patch'. (texlive-bin, texlive-extra-src): Update to 20170524. * gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/texlive-texmf-CVE-2016-10243.patch | 18 ------------------ gnu/packages/tex.scm | 22 +++++++++++----------- 3 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch diff --git a/gnu/local.mk b/gnu/local.mk index 37ee7f730..f2b72569d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1016,7 +1016,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ - %D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ diff --git a/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch b/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch deleted file mode 100644 index 3a9ae993f..000000000 --- a/gnu/packages/patches/texlive-texmf-CVE-2016-10243.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix CVE-2016-10243: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10243 - -Patch adapted from upstream commit: - -https://www.tug.org/svn/texlive?view=revision&revision=42605 - ---- trunk/Master/texmf-dist/web2c/texmf.cnf 2016/11/29 23:10:33 42604 -+++ trunk/Master/texmf-dist/web2c/texmf.cnf 2016/11/29 23:27:53 42605 -@@ -568,7 +568,6 @@ extractbb,\ - gregorio,\ - kpsewhich,\ - makeindex,\ --mpost,\ - repstopdf,\ - - % we'd like to allow: diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 729f9c01b..60b4a837b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Federico Beffa <be...@fbengineering.ch> ;;; Copyright © 2016 Thomas Danckaert <p...@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rek...@elephly.net> +;;; Copyright © 2017 Leo Famulari <l...@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,29 +67,28 @@ (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523-extra.tar.xz";) + (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-extra.tar.xz";) (sha256 (base32 - "0q4a92zmwhn4ry6xgrp4k8wq11ax2sg9rg9yrsrdkr719y0x887a")))) + "0zvd2zskk78ig114mfj24g15qys41hzqv59fmqpirdbgq9c9gr5g")))) (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-texmf.tar.xz";) - (patches (search-patches "texlive-texmf-CVE-2016-10243.patch")) - (patch-flags '("-p2")) + (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-texmf.tar.xz";) (sha256 (base32 - "1dv8vgfzpczqw82hv9g7a8djhhyzywljmrarlcyy6g2qi5q51glr")))) + "1v69y3kgkbk24f7s4dfkknwd317mqmck5jgpyb35wqgqfy5p0qrz")))) (define-public texlive-bin (package (name "texlive-bin") - (version "2016") + (version "20170524") (source (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523b-source.tar.xz";) + (uri (string-append "ftp://tug.org/historic/systems/texlive/2017/"; + "texlive-" version "-source.tar.xz")) (sha256 (base32 - "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8")))) + "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81")))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) @@ -3808,7 +3808,7 @@ directly generate PDF documents instead of DVI.") (define texlive-texmf (package (name "texlive-texmf") - (version "2016") + (version "2017") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -3880,7 +3880,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "2016") + (version "2017") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash) ; for wrap-program -- 2.13.3
From c2906b6d18b63a0c83eb318f3e0c34415c83e016 Mon Sep 17 00:00:00 2001
From: Leo Famulari <l...@famulari.name>
Date: Sat, 5 Aug 2017 18:34:51 -0400
Subject: [PATCH 2/2] gnu: biber: Update to 2.7.
* gnu/packages/tex.scm (biber)[name]: Rename to 'biber'.
(biber-2.5): Remove variable.
---
gnu/packages/tex.scm | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 60b4a837b..db08ed864 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4058,7 +4058,7 @@ values (strings, macros, or numbers) pasted together.")
(define-public biber
(package
- (name "biber-next")
+ (name "biber")
(version "2.7")
(source (origin
(method url-fetch)
@@ -4136,33 +4136,6 @@ values (strings, macros, or numbers) pasted together.")
other things it comes with full Unicode support.")
(license license:artistic2.0)))
-;; Our version of texlive comes with biblatex 3.4, which is only compatible
-;; with biber 2.5 according to the compatibility matrix in the biber
-;; documentation.
-(define-public biber-2.5
- (package (inherit biber)
- (name "biber")
- (version "2.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/plk/biber/archive/v";
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "163sd343wkrzwnvj2003m2j0kz517jmjr4savw6f8bjxhj8fdrqv"))))
- (arguments
- (substitute-keyword-arguments (package-arguments biber)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-before 'check 'delete-failing-test
- (lambda _
- (delete-file "t/sort-order.t")
- #t))))))
- (inputs
- `(("perl-date-simple" ,perl-date-simple)
- ,@(package-inputs biber)))))
-
(define-public rubber
(package
(name "rubber")
--
2.13.3
signature.asc
Description: PGP signature
