summary refs log tree commit diff
path: root/pkgs/tools/typesetting/biber
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-18 15:56:03 +0000
committerOrivej Desh <orivej@gmx.fr>2017-12-18 15:56:03 +0000
commit7c58e8dfc2bbe975147c7e1ee4b6066703b56528 (patch)
treeda3868d8a4bc0e2c7dce49d3be02661490d83131 /pkgs/tools/typesetting/biber
parentc4b71137bfe30e2f8f454e8c28c09df492bf65e3 (diff)
parent68d57167b058d86c41107da5c62190ffcf99dfe0 (diff)
downloadnixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.gz
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.bz2
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.lz
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.xz
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.zst
nixpkgs-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.zip
Merge branch 'master' into staging
* master: (125 commits)
  scummvm: fix eval
  tinycc: 0.9.27pre-20171016 -> 0.9.27
  Update terraform provider versions
  vscode: 1.18.1 -> 1.19.0
  linux: 4.14.6 -> 4.14.7
  scummvm: 1.9.0 -> 2.0.0
  cmst: 2017.03.18 -> 2017.09.19
  albert: 0.14.7 -> 0.14.14
  obs-studio: fix vlc plugin
  ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
  uchiwa: 0.26.3 -> 1.1.0
  linux-testing: 4.15-rc3 -> 4.15-rc4
  steam: override nss, nspr, fixes #32781
  ponyc: 0.20.0 -> 0.21.0
  pythonPackages.pwntools: disable tests
  gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4
  vim-rhubarb: init at 2017-06-28
  atom: depend on libsecret
  nvidia-settings: Make sure binary can find libXv.so
  backblaze-b2: 0.6.2 -> 1.1.0
  ...
Diffstat (limited to 'pkgs/tools/typesetting/biber')
-rw-r--r--pkgs/tools/typesetting/biber/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 12ea90fa725..8fd04194124 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -2,10 +2,11 @@
 , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple
 , DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian
 , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder
-, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
+, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
 , MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate
 , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor
-, TextCSV, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey }:
+, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey
+, TestDifferences }:
 
 buildPerlModule rec {
   name = "biber-${version}";
@@ -21,13 +22,14 @@ buildPerlModule rec {
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
     DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
     DateTime DateTimeFormatBuilder DateTimeCalendarJulian
-    ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+    ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
     ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
     UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
-    ClassAccessor TextCSV TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
+    ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
+    TestDifferences
   ];
 
-  # Tests seem to be broken
+  # Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25)
   doCheck = false;
 
   meta = {