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 ...
This commit is contained in:
@@ -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 = {
|
||||
|
||||
@@ -68,8 +68,8 @@ let
|
||||
collection-metapost = orig.collection-metapost // {
|
||||
deps = orig.collection-metapost.deps // { inherit (tl) metafont; };
|
||||
};
|
||||
collection-genericextra = orig.collection-genericextra // {
|
||||
deps = orig.collection-genericextra.deps // { inherit (tl) xdvi; };
|
||||
collection-plaingeneric = orig.collection-plaingeneric // {
|
||||
deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; };
|
||||
};
|
||||
}); # overrides
|
||||
|
||||
|
||||
@@ -7582,6 +7582,8 @@
|
||||
"unicode-bidi.doc-0.01"="8x4zk0spvhmq3sc8ygvidk03gfzm2875";
|
||||
"unisugar-0.92"="wfr974a1y4wzlbw0wwzfr6r0yp9nyasl";
|
||||
"unisugar.doc-0.92"="hcnqifbhpj44cwbr8sh4c71phg4i5327";
|
||||
"xdvi-22.87.03"="g5irfc0gf7bra3vngv6kdbkhbyicdz84";
|
||||
"xdvi.doc-22.87.03"="h2d03izpvnpsii465g3hf299z3ndv4vl";
|
||||
"xebaposter-2.51"="glxmnnhjpy8wjab9avncl4v0wmdf0pv7";
|
||||
"xebaposter.doc-2.51"="sbpqsj7cqhhhs9gq8jia92hxrdgnhzkk";
|
||||
"xechangebar-1.0"="1f2zszj2l5mkqv5zs5bs8g5w4c8rirpv";
|
||||
|
||||
Reference in New Issue
Block a user