From 5c0478a9ab1f1910d1296443b830782f56d22e90 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 2 Sep 2019 09:54:20 +0200 Subject: [PATCH] biber: fix currently broken tests --- pkgs/tools/typesetting/biber/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 6d26129f2c12..55349641ab62 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, shortenPerlShebang, texlive }: +{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); @@ -10,6 +10,20 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + patches = stdenv.lib.optionals (stdenv.lib.versionAtLeast perlPackages.perl.version "5.30") [ + (fetchpatch { + name = "biber-fix-tests.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1ninf46bxf4hm0p5arqbxqyv8r98xdwab34vvp467q1v23kfbhya"; + }) + + (fetchpatch { + name = "biber-fix-tests-2.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests-2.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812"; + sha256 = "1l8pk454kkm0szxrv9rv9m2a0llw1jm7ffhgpyg4zfiw246n62x0"; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K