diff mbox series

[bug#38271] gnu: biber: Update to 2.13.

Message ID m1r2237v4b.fsf@kh-macbookpro.home
State Accepted
Headers show
Series [bug#38271] gnu: biber: Update to 2.13. | expand

Commit Message

Konrad Hinsen Nov. 19, 2019, 3:13 p.m. UTC 
* gnu/packages/tex.scm (biber): Update to 2.13.
---
 .../patches/biber-fix-encoding-write.patch    | 31 -------------------
 gnu/packages/tex.scm                          |  7 ++---
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 gnu/packages/patches/biber-fix-encoding-write.patch

Comments

Konrad Hinsen Nov. 19, 2019, 5:01 p.m. UTC | #1 
Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> * gnu/packages/tex.scm (biber): Update to 2.13.

Please cancel this patch. I just discovered that biber 2.13 is not
compatible with the texlive version currently in Guix.

I tried updating because biber 2.12 fails to build. I will submit
a bug report for that.

Cheers
  Konrad.
Efraim Flashner Nov. 19, 2019, 8:53 p.m. UTC | #2 
On Tue, Nov 19, 2019 at 06:01:08PM +0100, Konrad Hinsen wrote:
> Konrad Hinsen <konrad.hinsen@fastmail.net> writes:
> 
> > * gnu/packages/tex.scm (biber): Update to 2.13.
> 
> Please cancel this patch. I just discovered that biber 2.13 is not
> compatible with the texlive version currently in Guix.
> 
> I tried updating because biber 2.12 fails to build. I will submit
> a bug report for that.

I remember biber being something of a special package when it comes to
texlive
diff mbox series

Patch

diff --git a/gnu/packages/patches/biber-fix-encoding-write.patch b/gnu/packages/patches/biber-fix-encoding-write.patch
deleted file mode 100644
index 56cd11212e..0000000000
--- a/gnu/packages/patches/biber-fix-encoding-write.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 2a9b15aefb842a734637f3d230936ea1b7c60096 Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Thu, 8 Nov 2018 22:02:09 +0100
-Subject: [PATCH] Fix to address #239
-
----
- lib/Biber.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Biber.pm b/lib/Biber.pm
-index 8b1f80a5..d97fca29 100644
---- a/lib/Biber.pm
-+++ b/lib/Biber.pm
-@@ -311,6 +311,8 @@ sub parse_ctrlfile {
-     unless (eval {$checkbuf = File::Slurper::read_text($ctrl_file_path, 'latin1')}) {
-       biber_error("$ctrl_file_path is not UTF-8 or even latin1, how horrible.");
-     }
-+    # Write ctrl file as UTF-8
-+    File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
-   }
- 
-   $checkbuf = NFD($checkbuf);# Unicode NFD boundary
-@@ -319,8 +321,6 @@ sub parse_ctrlfile {
-     unlink($output) unless $output eq '-';# ignore deletion of STDOUT marker
-     biber_error("$ctrl_file_path is malformed, last biblatex run probably failed. Deleted $output");
-   }
--  # Write ctrl file as UTF-8
--  File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
- 
-   # Validate if asked to
-   if (Biber::Config->getoption('validate_control')) {
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d184d7616b..6a81ba7bbd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6035,19 +6035,16 @@  values (strings, macros, or numbers) pasted together.")
 (define-public biber
   (package
     (name "biber")
-    (version "2.12")
+    (version "2.13")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/plk/biber/")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
-              ;; TODO: Patch awaiting inclusion upstream (see:
-              ;; https://github.com/plk/biber/issues/239).
-              (patches (search-patches "biber-fix-encoding-write.patch"))
               (sha256
                (base32
-                "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
+                "0855nw7cci3812lys20vb3zckyvs5axmyiqa8zf0afsj70kvzj2d"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases