Merge pull request #44519 from oxij/pkg/biber-cleanup

biber: cleanup
This commit is contained in:
Silvan Mosberger 2018-08-05 22:21:29 +02:00 committed by GitHub
commit 08c82ad24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 26 deletions

View File

@ -1,16 +1,9 @@
{ stdenv, fetchFromGitHub, buildPerlModule, autovivification, BusinessISBN
, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple
, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian
, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder
, FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate
, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor
, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey
, TestDifferences }:
{ stdenv, fetchFromGitHub, perlPackages }:
buildPerlModule rec {
perlPackages.buildPerlModule rec {
name = "biber-${version}";
version = "2.7";
src = fetchFromGitHub {
owner = "plk";
repo = "biber";
@ -18,7 +11,7 @@ buildPerlModule rec {
sha256 = "04jmsh59g2s0b61rm25z0hwb6yliqyh5gjs4y74va93d2b9mrd17";
};
buildInputs = [
buildInputs = with perlPackages; [
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
DateTime DateTimeFormatBuilder DateTimeCalendarJulian
@ -32,10 +25,10 @@ buildPerlModule rec {
# Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25)
doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "Backend for BibLaTeX";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.ttuegel ];
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix;
maintainers = [ maintainers.ttuegel ];
};
}

View File

@ -1607,17 +1607,7 @@ with pkgs;
bgs = callPackage ../tools/X11/bgs { };
biber = callPackage ../tools/typesetting/biber {
inherit (perlPackages) buildPerlModule
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
DateTime DateTimeFormatBuilder DateTimeCalendarJulian
ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
TestDifferences;
};
biber = callPackage ../tools/typesetting/biber { };
blueman = callPackage ../tools/bluetooth/blueman {
withPulseAudio = config.pulseaudio or true;