From 101b4ec5463f64e231dc251ac486562e5a7a952e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 15 Dec 2017 19:02:00 +0100 Subject: [PATCH] biber: 2.5 -> 2.7 Fixes #32715. --- pkgs/tools/typesetting/biber/default.nix | 28 ++++++++++++------------ pkgs/top-level/all-packages.nix | 7 +++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index f068323e54a7..99ef60b399dc 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,39 +1,39 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, autovivification, BusinessISBN +{ stdenv, fetchFromGitHub, buildPerlModule, autovivification, BusinessISBN , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple +, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils -, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate +, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize }: +, TextCSV, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey }: -let - version = "2.5"; -in -buildPerlPackage { +buildPerlModule rec { name = "biber-${version}"; + version = "2.7"; src = fetchFromGitHub { owner = "plk"; repo = "biber"; rev = "v${version}"; - sha256 = "1ldkszsr2n11nib4nvmpvsxmvp0qd9w3lxijyqlf01cfaryjdzgr"; + sha256 = "04jmsh59g2s0b61rm25z0hwb6yliqyh5gjs4y74va93d2b9mrd17"; }; buildInputs = [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils - ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize + ClassAccessor TextCSV TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey ]; - preConfigure = "touch Makefile.PL"; - buildPhase = "perl Build.PL --prefix=$out; ./Build build"; - checkPhase = "./Build test"; - installPhase = "./Build install"; # Tests seem to be broken doCheck = false; + postUnpack = '' + sed '1s/env perl/perl/' -i */bin/biber + ''; + meta = { description = "Backend for BibLaTeX"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fca81dcf6c98..97452fe38eda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1329,13 +1329,14 @@ with pkgs; bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { - inherit (perlPackages) + inherit (perlPackages) buildPerlModule autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils - ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextRoman DataUniqid LinguaTranslit UnicodeNormalize; + ClassAccessor TextCSV TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey; }; blueman = callPackage ../tools/bluetooth/blueman {