diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index bdb33196db9..f068323e54a 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN +{ stdenv, fetchFromGitHub, buildPerlPackage, autovivification, BusinessISBN , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextRoman, DataUniqid }: +, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize }: let - version = "2.4"; - pn = "biblatex-biber"; + version = "2.5"; in buildPerlPackage { name = "biber-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; - sha256 = "1gccbs5vzs3fca41d9dwl6nrdljnh29yls8xzfw04hd57yrfn5w4"; + src = fetchFromGitHub { + owner = "plk"; + repo = "biber"; + rev = "v${version}"; + sha256 = "1ldkszsr2n11nib4nvmpvsxmvp0qd9w3lxijyqlf01cfaryjdzgr"; }; buildInputs = [ @@ -23,7 +24,7 @@ buildPerlPackage { ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid + ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize ]; preConfigure = "touch Makefile.PL"; buildPhase = "perl Build.PL --prefix=$out; ./Build build"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b05616f7b3..cee4c71db81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -924,7 +924,7 @@ in ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid; + ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize; }; bibtextools = callPackage ../tools/typesetting/bibtex-tools { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 387e886927e..4a60ed7f16b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7123,6 +7123,15 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + LinguaTranslit = buildPerlPackage rec { + name = "Lingua-Translit-0.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALINKE/${name}.tar.gz"; + sha256 = "2430b5c84927f15570533eb68c56958c580f16044fc413d48bf44f0460422598"; + }; + doCheck = false; + }; + LinuxDistribution = buildPerlPackage { name = "Linux-Distribution-0.23"; src = fetchurl { @@ -13036,11 +13045,11 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.71"; + name = "Text-BibTeX-0.72"; buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "1jwi4yc4l1sf9pyc6qifcm493lwf8iggdjli7f9a9aqin1swh36d"; + sha256 = "0vfnj9ygdjympc8hsf38nc4a1lq45qbq7v6z6mrnfgr3k198b6gw"; }; meta = { description = "Interface to read and parse BibTeX files"; @@ -13880,11 +13889,11 @@ let self = _self // overrides; _self = with self; { }; }; - UnicodeNormalize = buildPerlPackage { - name = "Unicode-Normalize-1.19"; + UnicodeNormalize = buildPerlPackage rec { + name = "Unicode-Normalize-1.25"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Normalize-1.19.tar.gz; - sha256 = "ab16467692cb78ced706fb7bee4145ac09d9f14d9eed92be4a305de3172ce6c4"; + url = "mirror://cpan/authors/id/K/KH/KHW/${name}.tar.gz"; + sha256 = "00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c"; }; meta = { description = "Unicode Normalization Forms";