summary refs log tree commit diff
path: root/pkgs/tools/typesetting/biber
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2021-01-09 18:45:38 -0500
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2021-01-11 13:02:54 -0500
commitc5787e5b8cc68d9478758b742f5da43b5ee7f909 (patch)
tree2bfe93a778a9640b17297cb15b3263a9ba47831f /pkgs/tools/typesetting/biber
parentac255ab62e514c1e28ff0519cafd5700699c04d6 (diff)
downloadnixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar.gz
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar.bz2
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar.lz
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar.xz
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.tar.zst
nixpkgs-c5787e5b8cc68d9478758b742f5da43b5ee7f909.zip
texlive: 2020.20201009 -> 2020.20210109
Diffstat (limited to 'pkgs/tools/typesetting/biber')
-rw-r--r--pkgs/tools/typesetting/biber/default.nix26
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 1bcee62ac6c..ac0220cf561 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -1,7 +1,21 @@
-{ lib, stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
+{ lib, stdenv, fetchurl, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
 
 let
   biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
+
+  # perl 5.32.0 ships with U:C 1.27
+  UnicodeCollate_1_29 = perlPackages.buildPerlPackage rec {
+    pname = "Unicode-Collate";
+    version = "1.29";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${pname}-${version}.tar.gz";
+      sha256 = "0dr4k10fgbsczh4sz7w8d0nnba38r6jrg87cm3gw4xxgn55fzj7l";
+    };
+    meta = {
+      description = "Unicode Collation Algorithm";
+      license = perlPackages.perl.meta.license;
+    };
+  };
 in
 
 perlPackages.buildPerlModule {
@@ -10,21 +24,13 @@ perlPackages.buildPerlModule {
 
   src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
-  patches = [
-    # Fix for https://github.com/plk/biber/issues/329
-    (fetchpatch {
-      url = "https://github.com/plk/biber/commit/fa312ce402fe581ba7cc0890c83a1d47c2610e26.diff";
-      sha256 = "1j87mdwvx368z9b5x6b72s753hwvrldf2pb42p6hflq5hzkicy50";
-    })
-  ];
-
   buildInputs = with perlPackages; [
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
     DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
     DateTime DateTimeFormatBuilder DateTimeCalendarJulian
     ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
     ListMoreUtils MozillaCA ParseRecDescent IOString ReadonlyXS RegexpCommon TextBibTeX
-    UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
+    UnicodeCollate_1_29 UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
     ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey
     TestDifferences
     PerlIOutf8_strict