diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-05 22:21:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-05 22:21:29 +0200 |
| commit | 08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37 (patch) | |
| tree | 3e02de234cc6c48c9bb659bc62e94fcec8fe5ea6 | |
| parent | 176891c0adda2a50917c6662451af557512f44d3 (diff) | |
| parent | 66742ff4956a3371363cddc9985153cdb42cb5bb (diff) | |
| download | nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar.gz nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar.bz2 nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar.lz nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar.xz nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.tar.zst nixlib-08c82ad24cfa5f9105981731b8ed9e9fbd2bdf37.zip | |
Merge pull request #44519 from oxij/pkg/biber-cleanup
biber: cleanup
| -rw-r--r-- | pkgs/tools/typesetting/biber/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 9 insertions, 26 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index c9280c102b70..d19838f9ff06 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20199eb9fbf7..cd7deeae47fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |